openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Bump UCA and RDO to Liberty GA"

Browse Source
This commit is contained in:
Jenkins 2015-11-06 19:55:15 +00:00 committed by Gerrit Code Review
commit ccf9efb43e
2 changed files with 2 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fixtures/scenario001.pp
View File

@ -22,31 +22,13 @@ case $::osfamily {
include ::apt include ::apt
class { '::openstack_extras::repo::debian::ubuntu': class { '::openstack_extras::repo::debian::ubuntu':
release => 'liberty', release => 'liberty',
repo => 'proposed',
package_require => true, package_require => true,
} }
$package_provider = 'apt' $package_provider = 'apt'
} }
'RedHat': { 'RedHat': {
class { '::openstack_extras::repo::redhat::redhat': class { '::openstack_extras::repo::redhat::redhat':
manage_rdo => false, release => 'liberty',
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',
},
},
} }
package { 'openstack-selinux': ensure => 'latest' } package { 'openstack-selinux': ensure => 'latest' }
$package_provider = 'yum' $package_provider = 'yum'

20
fixtures/scenario002.pp
View File

@ -22,31 +22,13 @@ case $::osfamily {
include ::apt include ::apt
class { '::openstack_extras::repo::debian::ubuntu': class { '::openstack_extras::repo::debian::ubuntu':
release => 'liberty', release => 'liberty',
repo => 'proposed',
package_require => true, package_require => true,
} }
$package_provider = 'apt' $package_provider = 'apt'
} }
'RedHat': { 'RedHat': {
class { '::openstack_extras::repo::redhat::redhat': class { '::openstack_extras::repo::redhat::redhat':
manage_rdo => false, release => 'liberty',
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',
},
},
} }
package { 'openstack-selinux': ensure => 'latest' } package { 'openstack-selinux': ensure => 'latest' }
$package_provider = 'yum' $package_provider = 'yum'