From: Emilien Macchi <emilien@redhat.com>
Date: Wed, 4 Nov 2015 14:43:42 +0000 (-0500)
Subject: Bump UCA and RDO to Liberty GA
X-Git-Tag: 7.0.0~5^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=0705e8ea1e93192668fddc83d8144ac4ea21c4da;p=puppet-modules%2Fpuppet-ceilometer.git

Bump UCA and RDO to Liberty GA

Bump from UCA RDO Liberty testing to GA repos.
Depends-On: I19a1588c488d56b647703c0267540c7649fdc6d1

Change-Id: I931319d4a3989860a7532b1132788522c26d4b29
---

diff --git a/spec/acceptance/ceilometer_with_mysql_spec.rb b/spec/acceptance/ceilometer_with_mysql_spec.rb
index d1ef5c6..60f7322 100644
--- a/spec/acceptance/ceilometer_with_mysql_spec.rb
+++ b/spec/acceptance/ceilometer_with_mysql_spec.rb
@@ -21,31 +21,13 @@ describe 'ceilometer with mysql' do
           include ::apt
           class { '::openstack_extras::repo::debian::ubuntu':
             release         => 'liberty',
-            repo            => 'proposed',
             package_require => true,
           }
           $package_provider = 'apt'
         }
         'RedHat': {
           class { '::openstack_extras::repo::redhat::redhat':
-            manage_rdo => false,
-            repo_hash => {
-              'openstack-common-testing' => {
-                'baseurl'  => 'http://cbs.centos.org/repos/cloud7-openstack-common-testing/x86_64/os/',
-                'descr'    => 'openstack-common-testing',
-                'gpgcheck' => 'no',
-              },
-              'openstack-liberty-testing' => {
-                'baseurl'  => 'http://cbs.centos.org/repos/cloud7-openstack-liberty-testing/x86_64/os/',
-                'descr'    => 'openstack-liberty-testing',
-                'gpgcheck' => 'no',
-              },
-              'openstack-liberty-trunk' => {
-                'baseurl'  => 'http://trunk.rdoproject.org/centos7-liberty/current-passed-ci/',
-                'descr'    => 'openstack-liberty-trunk',
-                'gpgcheck' => 'no',
-              },
-            },
+            release => 'liberty',
           }
           package { 'openstack-selinux': ensure => 'latest' }
           $package_provider = 'yum'
diff --git a/spec/acceptance/ceilometer_wsgi_apache_spec.rb b/spec/acceptance/ceilometer_wsgi_apache_spec.rb
index 1b7575e..f454bcc 100644
--- a/spec/acceptance/ceilometer_wsgi_apache_spec.rb
+++ b/spec/acceptance/ceilometer_wsgi_apache_spec.rb
@@ -14,31 +14,13 @@ describe 'ceilometer with mysql' do
           include ::apt
           class { '::openstack_extras::repo::debian::ubuntu':
             release         => 'liberty',
-            repo            => 'proposed',
             package_require => true,
           }
           $package_provider = 'apt'
         }
         'RedHat': {
           class { '::openstack_extras::repo::redhat::redhat':
-            manage_rdo => false,
-            repo_hash => {
-              'openstack-common-testing' => {
-                'baseurl'  => 'http://cbs.centos.org/repos/cloud7-openstack-common-testing/x86_64/os/',
-                'descr'    => 'openstack-common-testing',
-                'gpgcheck' => 'no',
-              },
-              'openstack-liberty-testing' => {
-                'baseurl'  => 'http://cbs.centos.org/repos/cloud7-openstack-liberty-testing/x86_64/os/',
-                'descr'    => 'openstack-liberty-testing',
-                'gpgcheck' => 'no',
-              },
-              'openstack-liberty-trunk' => {
-                'baseurl'  => 'http://trunk.rdoproject.org/centos7-liberty/current-passed-ci/',
-                'descr'    => 'openstack-liberty-trunk',
-                'gpgcheck' => 'no',
-              },
-            },
+            release => 'liberty',
           }
           package { 'openstack-selinux': ensure => 'latest' }
           $package_provider = 'yum'