From edb7fd9b4bc3fa2fdb56a03164ded17f8b0063d1 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Wed, 4 Nov 2015 10:14:14 -0500
Subject: [PATCH] Bump UCA and RDO to Liberty GA

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

Change-Id: Id01531cd92bddd6ffa2302ee557934cdc43ca235
---
 spec/acceptance/basic_keystone_spec.rb        | 20 +------------------
 ...stone_federation_identity_provider_spec.rb | 20 +------------------
 spec/acceptance/keystone_wsgi_apache_spec.rb  | 20 +------------------
 3 files changed, 3 insertions(+), 57 deletions(-)

diff --git a/spec/acceptance/basic_keystone_spec.rb b/spec/acceptance/basic_keystone_spec.rb
index b179bfb97..65763dc24 100644
--- a/spec/acceptance/basic_keystone_spec.rb
+++ b/spec/acceptance/basic_keystone_spec.rb
@@ -21,30 +21,12 @@ describe 'basic keystone server with resources' do
           include ::apt
           class { '::openstack_extras::repo::debian::ubuntu':
             release         => 'liberty',
-            repo            => 'proposed',
             package_require => true,
           }
         }
         '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' }
         }
diff --git a/spec/acceptance/keystone_federation_identity_provider_spec.rb b/spec/acceptance/keystone_federation_identity_provider_spec.rb
index 2dd856930..e3d66c45f 100644
--- a/spec/acceptance/keystone_federation_identity_provider_spec.rb
+++ b/spec/acceptance/keystone_federation_identity_provider_spec.rb
@@ -14,30 +14,12 @@ describe 'keystone server running with Apache/WSGI as Identity Provider' do
           include ::apt
           class { '::openstack_extras::repo::debian::ubuntu':
             release         => 'liberty',
-            repo            => 'proposed',
             package_require => true,
           }
         }
         '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' }
         }
diff --git a/spec/acceptance/keystone_wsgi_apache_spec.rb b/spec/acceptance/keystone_wsgi_apache_spec.rb
index 73fc911e3..338388cb5 100644
--- a/spec/acceptance/keystone_wsgi_apache_spec.rb
+++ b/spec/acceptance/keystone_wsgi_apache_spec.rb
@@ -14,30 +14,12 @@ describe 'keystone server running with Apache/WSGI with resources' do
           include ::apt
           class { '::openstack_extras::repo::debian::ubuntu':
             release         => 'liberty',
-            repo            => 'proposed',
             package_require => true,
           }
         }
         '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' }
         }