aodh: remove combination_alarms workaround

The combination_alarms test has been skipped in Aodh because the feature
is not working out of the box anymore in Newton; we can drop our
workaround to make it working.

Change-Id: I12e623cae1ea2707ffdc955a9b6e4b939eeb3e86

manifests/aodh.pp

@@ -79,8 +79,4 @@ class openstack_integration::aodh {
   class { '::aodh::evaluator': }
   class { '::aodh::db::sync': }
 
-  # TODO: remove this workaround after this bug is solved
-  # https://bugs.launchpad.net/aodh/+bug/1585267
-  aodh_config { 'api/enable_combination_alarms': value => true; }
-
 }

manifests/repos.pp

@@ -24,7 +24,7 @@ class openstack_integration::repos {
         manage_epel => false,
         repo_hash   => {
           'newton-current'       => {
-            'baseurl'  => 'https://trunk.rdoproject.org/centos7-master/12/4a/124abf1278262345ecbde6df12630fbb7ffbf712_2382d3c4/',
+            'baseurl'  => 'https://trunk.rdoproject.org/centos7-master/55/47/5547170191b2306e4c72d64599d58a69935b750a_afa16dfd/',
             'descr'    => 'Newton current',
             'gpgcheck' => 'no',
             'priority' => 1,