Merge "Bump UCA and RDO to Liberty GA"
This commit is contained in:
commit
ccf9efb43e
fixtures
@ -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'
|
||||
|
@ -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'
|
||||
|
Loading…
Reference in New Issue
Block a user