From 8c84fa23f47d7df6e22d840a614b28dccbb3d8aa Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Fri, 30 Oct 2015 22:19:23 -0400 Subject: [PATCH] Bump UCA and RDO to Liberty GA Bump from UCA RDO Liberty testing to GA repos. Depends-On: I709ae10101b7156a60efc10e88866abe3e643417 Change-Id: I19a1588c488d56b647703c0267540c7649fdc6d1 --- fixtures/scenario001.pp | 20 +------------------- fixtures/scenario002.pp | 20 +------------------- 2 files changed, 2 insertions(+), 38 deletions(-) diff --git a/fixtures/scenario001.pp b/fixtures/scenario001.pp index 6dea6313a..7c98d725f 100644 --- a/fixtures/scenario001.pp +++ b/fixtures/scenario001.pp @@ -22,31 +22,13 @@ case $::osfamily { 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/fixtures/scenario002.pp b/fixtures/scenario002.pp index 53af45341..352bdf4ca 100644 --- a/fixtures/scenario002.pp +++ b/fixtures/scenario002.pp @@ -22,31 +22,13 @@ case $::osfamily { 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'