Fix CI jobs
The branch for most Puppet modules in the github.com/puppetlabs namespace has changed from 'master' to 'main'. Also, the scheduler_default_filters parameter was removed from class nova::scheduler::filter in puppet-nova by [1]. And set ssl_verify_client parameter to apache::vhost to 'optional', since using a boolean 'false' is no longer valid [2]. [1] - https://review.opendev.org/c/openstack/puppet-nova/+/787967 [2] - https://github.com/puppetlabs/puppetlabs-apache/blob/main/manifests/vhost.pp#L1769 Change-Id: If98beab4946f0a97f3308db050318000f144ba07
This commit is contained in:
parent
eabad465d8
commit
e11676c125
14
Puppetfile
14
Puppetfile
|
@ -102,7 +102,7 @@ mod 'vswitch',
|
||||||
|
|
||||||
mod 'apache',
|
mod 'apache',
|
||||||
:git => 'https://github.com/puppetlabs/puppetlabs-apache',
|
:git => 'https://github.com/puppetlabs/puppetlabs-apache',
|
||||||
:ref => 'master'
|
:ref => 'main'
|
||||||
|
|
||||||
mod 'certmonger',
|
mod 'certmonger',
|
||||||
:git => 'https://github.com/rcritten/puppet-certmonger',
|
:git => 'https://github.com/rcritten/puppet-certmonger',
|
||||||
|
@ -110,15 +110,15 @@ mod 'certmonger',
|
||||||
|
|
||||||
mod 'concat',
|
mod 'concat',
|
||||||
:git => 'https://github.com/puppetlabs/puppetlabs-concat',
|
:git => 'https://github.com/puppetlabs/puppetlabs-concat',
|
||||||
:ref => 'master'
|
:ref => 'main'
|
||||||
|
|
||||||
mod 'firewall',
|
mod 'firewall',
|
||||||
:git => 'https://github.com/puppetlabs/puppetlabs-firewall',
|
:git => 'https://github.com/puppetlabs/puppetlabs-firewall',
|
||||||
:ref => 'master'
|
:ref => 'main'
|
||||||
|
|
||||||
mod 'inifile',
|
mod 'inifile',
|
||||||
:git => 'https://github.com/puppetlabs/puppetlabs-inifile',
|
:git => 'https://github.com/puppetlabs/puppetlabs-inifile',
|
||||||
:ref => 'master'
|
:ref => 'main'
|
||||||
|
|
||||||
mod 'memcached',
|
mod 'memcached',
|
||||||
:git => 'https://github.com/saz/puppet-memcached',
|
:git => 'https://github.com/saz/puppet-memcached',
|
||||||
|
@ -126,7 +126,7 @@ mod 'memcached',
|
||||||
|
|
||||||
mod 'mysql',
|
mod 'mysql',
|
||||||
:git => 'https://github.com/puppetlabs/puppetlabs-mysql',
|
:git => 'https://github.com/puppetlabs/puppetlabs-mysql',
|
||||||
:ref => 'master'
|
:ref => 'main'
|
||||||
|
|
||||||
mod 'nssdb',
|
mod 'nssdb',
|
||||||
:git => 'https://github.com/rcritten/puppet-nssdb',
|
:git => 'https://github.com/rcritten/puppet-nssdb',
|
||||||
|
@ -154,7 +154,7 @@ mod 'ssh',
|
||||||
|
|
||||||
mod 'stdlib',
|
mod 'stdlib',
|
||||||
:git => 'https://github.com/puppetlabs/puppetlabs-stdlib',
|
:git => 'https://github.com/puppetlabs/puppetlabs-stdlib',
|
||||||
:ref => 'master'
|
:ref => 'main'
|
||||||
|
|
||||||
mod 'sysctl',
|
mod 'sysctl',
|
||||||
:git => 'https://github.com/duritong/puppet-sysctl',
|
:git => 'https://github.com/duritong/puppet-sysctl',
|
||||||
|
@ -166,7 +166,7 @@ mod 'systemd',
|
||||||
|
|
||||||
mod 'vcsrepo',
|
mod 'vcsrepo',
|
||||||
:git => 'https://github.com/puppetlabs/puppetlabs-vcsrepo',
|
:git => 'https://github.com/puppetlabs/puppetlabs-vcsrepo',
|
||||||
:ref => 'master'
|
:ref => 'main'
|
||||||
|
|
||||||
mod 'xinetd',
|
mod 'xinetd',
|
||||||
:git => 'https://github.com/puppetlabs/puppetlabs-xinetd',
|
:git => 'https://github.com/puppetlabs/puppetlabs-xinetd',
|
||||||
|
|
|
@ -33,7 +33,7 @@ class packstack::horizon ()
|
||||||
ssl_cert => hiera('CONFIG_HORIZON_SSL_CERT', undef),
|
ssl_cert => hiera('CONFIG_HORIZON_SSL_CERT', undef),
|
||||||
ssl_key => hiera('CONFIG_HORIZON_SSL_KEY', undef),
|
ssl_key => hiera('CONFIG_HORIZON_SSL_KEY', undef),
|
||||||
ssl_ca => hiera('CONFIG_HORIZON_SSL_CACERT', undef),
|
ssl_ca => hiera('CONFIG_HORIZON_SSL_CACERT', undef),
|
||||||
ssl_verify_client => false,
|
ssl_verify_client => 'optional',
|
||||||
neutron_options => {
|
neutron_options => {
|
||||||
'enable_vpn' => hiera('CONFIG_HORIZON_NEUTRON_VPN'),
|
'enable_vpn' => hiera('CONFIG_HORIZON_NEUTRON_VPN'),
|
||||||
'enable_lb' => hiera('CONFIG_HORIZON_NEUTRON_LB'),
|
'enable_lb' => hiera('CONFIG_HORIZON_NEUTRON_LB'),
|
||||||
|
|
|
@ -1,12 +1,6 @@
|
||||||
class packstack::nova::sched ()
|
class packstack::nova::sched ()
|
||||||
{
|
{
|
||||||
class {'::nova::scheduler::filter':
|
include '::nova::scheduler::filter'
|
||||||
scheduler_default_filters => ['AvailabilityZoneFilter',
|
|
||||||
'ComputeFilter',
|
|
||||||
'ComputeCapabilitiesFilter', 'ImagePropertiesFilter',
|
|
||||||
'ServerGroupAntiAffinityFilter',
|
|
||||||
'ServerGroupAffinityFilter'],
|
|
||||||
}
|
|
||||||
|
|
||||||
class { '::nova::scheduler':
|
class { '::nova::scheduler':
|
||||||
enabled => true,
|
enabled => true,
|
||||||
|
|
Loading…
Reference in New Issue