Force qemu emulation in CI and add dmidecode command to logs
Some upstream infra is enabling nested virtualization but it's failing randomly so let's force qemu virt_type. We need it to debugs issues with jobs incorrectly detecting virtualization time. Change-Id: I1e53bbdcccb6402d343c98abf2696d452717d1a9 (cherry picked from commitc84e3b6e84
) Fix rabbitmq configuration We can move to the commit hash for puppet-rabbitmq used in RDO queens, since this is what we are testing in RDO. This requires a few changes: - Update the URL used in the Puppetfile, and set the branch to 'master'. - Remove old workarounds in amqp.pp - Set loopback_users properly, based on what is requested by [1]. [1] -0ada399b33
Also do below [Queens Only] changes to clear gate issues:- - Install PyYAML==3.12 as latest version has issues with older setuptools(22.0.5). - Install openstack modules from stable/queens rather than master. Closes-Bug: #1839922 Change-Id: I9262836eb05a47bfe78ea0ac6d1c04199f29f527 (cherry picked from commitb1c78d696a
)
This commit is contained in:
parent
3508f8d5c1
commit
d18775cdf5
50
Puppetfile
50
Puppetfile
|
@ -4,95 +4,95 @@ moduledir '/usr/share/openstack-puppet/modules'
|
|||
|
||||
mod 'aodh',
|
||||
:git => 'https://github.com/openstack/puppet-aodh',
|
||||
:ref => 'master'
|
||||
:ref => 'stable/queens'
|
||||
|
||||
mod 'ceilometer',
|
||||
:git => 'https://github.com/openstack/puppet-ceilometer',
|
||||
:ref => 'master'
|
||||
:ref => 'stable/queens'
|
||||
|
||||
mod 'cinder',
|
||||
:git => 'https://github.com/openstack/puppet-cinder',
|
||||
:ref => 'master'
|
||||
:ref => 'stable/queens'
|
||||
|
||||
mod 'glance',
|
||||
:git => 'https://github.com/openstack/puppet-glance',
|
||||
:ref => 'master'
|
||||
:ref => 'stable/queens'
|
||||
|
||||
mod 'gnocchi',
|
||||
:git => 'https://github.com/openstack/puppet-gnocchi',
|
||||
:ref => 'master'
|
||||
:ref => 'stable/queens'
|
||||
|
||||
mod 'heat',
|
||||
:git => 'https://github.com/openstack/puppet-heat',
|
||||
:ref => 'master'
|
||||
:ref => 'stable/queens'
|
||||
|
||||
mod 'magnum',
|
||||
:git => 'https://github.com/openstack/puppet-magnum',
|
||||
:ref => 'master'
|
||||
:ref => 'stable/queens'
|
||||
|
||||
mod 'horizon',
|
||||
:git => 'https://github.com/openstack/puppet-horizon',
|
||||
:ref => 'master'
|
||||
:ref => 'stable/queens'
|
||||
|
||||
mod 'ironic',
|
||||
:git => 'https://github.com/openstack/puppet-ironic',
|
||||
:ref => 'master'
|
||||
:ref => 'stable/queens'
|
||||
|
||||
mod 'keystone',
|
||||
:git => 'https://github.com/openstack/puppet-keystone',
|
||||
:ref => 'master'
|
||||
:ref => 'stable/queens'
|
||||
|
||||
mod 'manila',
|
||||
:git => 'https://github.com/openstack/puppet-manila',
|
||||
:ref => 'master'
|
||||
:ref => 'stable/queens'
|
||||
|
||||
mod 'neutron',
|
||||
:git => 'https://github.com/openstack/puppet-neutron',
|
||||
:ref => 'master'
|
||||
:ref => 'stable/queens'
|
||||
|
||||
mod 'nova',
|
||||
:git => 'https://github.com/openstack/puppet-nova',
|
||||
:ref => 'master'
|
||||
:ref => 'stable/queens'
|
||||
|
||||
mod 'openstack_extras',
|
||||
:git => 'https://github.com/openstack/puppet-openstack_extras',
|
||||
:ref => 'master'
|
||||
:ref => 'stable/queens'
|
||||
|
||||
mod 'openstacklib',
|
||||
:git => 'https://github.com/openstack/puppet-openstacklib',
|
||||
:ref => 'master'
|
||||
:ref => 'stable/queens'
|
||||
|
||||
mod 'oslo',
|
||||
:git => 'https://github.com/openstack/puppet-oslo',
|
||||
:ref => 'master'
|
||||
:ref => 'stable/queens'
|
||||
|
||||
mod 'ovn',
|
||||
:git => 'https://github.com/openstack/puppet-ovn',
|
||||
:ref => 'master'
|
||||
:ref => 'stable/queens'
|
||||
|
||||
mod 'panko',
|
||||
:git => 'https://github.com/openstack/puppet-panko',
|
||||
:ref => 'master'
|
||||
:ref => 'stable/queens'
|
||||
|
||||
mod 'sahara',
|
||||
:git => 'https://github.com/openstack/puppet-sahara',
|
||||
:ref => 'master'
|
||||
:ref => 'stable/queens'
|
||||
|
||||
mod 'swift',
|
||||
:git => 'https://github.com/openstack/puppet-swift',
|
||||
:ref => 'master'
|
||||
:ref => 'stable/queens'
|
||||
|
||||
mod 'tempest',
|
||||
:git => 'https://github.com/openstack/puppet-tempest',
|
||||
:ref => 'master'
|
||||
:ref => 'stable/queens'
|
||||
|
||||
mod 'trove',
|
||||
:git => 'https://github.com/openstack/puppet-trove',
|
||||
:ref => 'master'
|
||||
:ref => 'stable/queens'
|
||||
|
||||
mod 'vswitch',
|
||||
:git => 'https://github.com/openstack/puppet-vswitch',
|
||||
:ref => 'master'
|
||||
:ref => 'stable/queens'
|
||||
|
||||
## Non-OpenStack modules
|
||||
|
||||
|
@ -129,8 +129,8 @@ mod 'nssdb',
|
|||
:ref => 'master'
|
||||
|
||||
mod 'rabbitmq',
|
||||
:git => 'https://github.com/puppetlabs/puppetlabs-rabbitmq',
|
||||
:ref => '5.6.0'
|
||||
:git => 'https://github.com/voxpupuli/puppet-rabbitmq',
|
||||
:ref => '7613f08657d6640b22ec0f4cb55cf5b3c2f2e397'
|
||||
|
||||
mod 'redis',
|
||||
:git => 'https://github.com/arioch/puppet-redis',
|
||||
|
|
|
@ -28,11 +28,11 @@ define enable_rabbitmq {
|
|||
package_provider => 'yum',
|
||||
repos_ensure => false,
|
||||
admin_enable => false,
|
||||
loopback_users => [],
|
||||
# FIXME: it's ugly to not to require client certs
|
||||
ssl_fail_if_no_peer_cert => true,
|
||||
config_variables => {
|
||||
'tcp_listen_options' => '[binary,{packet, raw},{reuseaddr, true},{backlog, 128},{nodelay, true},{exit_on_close, false},{keepalive, true}]',
|
||||
'loopback_users' => '[]',
|
||||
},
|
||||
}
|
||||
} else {
|
||||
|
@ -44,21 +44,12 @@ define enable_rabbitmq {
|
|||
package_provider => 'yum',
|
||||
repos_ensure => false,
|
||||
admin_enable => false,
|
||||
loopback_users => [],
|
||||
config_variables => {
|
||||
'tcp_listen_options' => '[binary,{packet, raw},{reuseaddr, true},{backlog, 128},{nodelay, true},{exit_on_close, false},{keepalive, true}]',
|
||||
'loopback_users' => '[]',
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
# TO-DO: remove this workaround as soon as this is fixed in puppetlabs-rabbitmq module
|
||||
# https://github.com/puppetlabs/puppetlabs-rabbitmq/pull/454
|
||||
File <| path == '/etc/rabbitmq/rabbitmq.config' |> {
|
||||
ensure => present,
|
||||
owner => 'rabbitmq',
|
||||
group => 'rabbitmq',
|
||||
mode => '0640',
|
||||
}
|
||||
}
|
||||
|
||||
class packstack::amqp ()
|
||||
|
|
|
@ -240,6 +240,8 @@ fi
|
|||
if [ "${INSTALL_FROM_SOURCE}" = true ]; then
|
||||
# pycparser 2.19 seems to have trouble with older setuptools versions
|
||||
$SUDO pip install pycparser==2.18
|
||||
# PyYAML > 5 has some issue with setuptools queens version(22.0.5), try installing stable version
|
||||
$SUDO pip install PyYAML==3.12
|
||||
$SUDO pip install .
|
||||
export GEM_BIN_DIR=/tmp/packstackgems/bin/
|
||||
export PUPPETFILE_DIR=/usr/share/openstack-puppet/modules
|
||||
|
|
|
@ -36,6 +36,7 @@ $SUDO packstack ${ADDITIONAL_ARGS} \
|
|||
--os-horizon-ssl=y \
|
||||
--amqp-enable-ssl=y \
|
||||
--glance-backend=file \
|
||||
--nova-libvirt-virt-type=qemu \
|
||||
--provision-uec-kernel-url="/tmp/cirros/cirros-0.3.5-x86_64-vmlinuz" \
|
||||
--provision-uec-ramdisk-url="/tmp/cirros/cirros-0.3.5-x86_64-initrd" \
|
||||
--provision-uec-disk-url="/tmp/cirros/cirros-0.3.5-x86_64-disk.img" \
|
||||
|
|
|
@ -41,6 +41,7 @@ $SUDO packstack ${ADDITIONAL_ARGS} \
|
|||
--os-sahara-install=y \
|
||||
--os-trove-install=y \
|
||||
--keystone-token-format=UUID \
|
||||
--nova-libvirt-virt-type=qemu \
|
||||
--provision-uec-kernel-url="/tmp/cirros/cirros-0.3.5-x86_64-vmlinuz" \
|
||||
--provision-uec-ramdisk-url="/tmp/cirros/cirros-0.3.5-x86_64-initrd" \
|
||||
--provision-uec-disk-url="/tmp/cirros/cirros-0.3.5-x86_64-disk.img" \
|
||||
|
|
|
@ -39,6 +39,7 @@ $SUDO packstack ${ADDITIONAL_ARGS} \
|
|||
--os-heat-install=y \
|
||||
--os-magnum-install=y \
|
||||
--os-panko-install=y \
|
||||
--nova-libvirt-virt-type=qemu \
|
||||
--provision-uec-kernel-url="/tmp/cirros/cirros-0.3.5-x86_64-vmlinuz" \
|
||||
--provision-uec-ramdisk-url="/tmp/cirros/cirros-0.3.5-x86_64-initrd" \
|
||||
--provision-uec-disk-url="/tmp/cirros/cirros-0.3.5-x86_64-disk.img" \
|
||||
|
|
|
@ -52,6 +52,7 @@ function get_diag_commands {
|
|||
'rpm -qa'
|
||||
'journalctl --no-pager'
|
||||
'ulimit -n'
|
||||
'dmidecode'
|
||||
)
|
||||
|
||||
echo "Installing required RPM packages..."
|
||||
|
|
Loading…
Reference in New Issue