diff --git a/.gitreview b/.gitreview index 975ab6db..eca594fd 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,4 @@ host=review.opendev.org port=29418 project=openstack/puppet-openstack-integration.git +defaultbranch=stable/2024.2 diff --git a/Puppetfile b/Puppetfile index deaba723..9c47333c 100644 --- a/Puppetfile +++ b/Puppetfile @@ -3,15 +3,15 @@ ## OpenStack modules mod 'aodh', :git => 'https://opendev.org/openstack/puppet-aodh', - :ref => 'master' + :ref => 'stable/2024.2' mod 'barbican', :git => 'https://opendev.org/openstack/puppet-barbican', - :ref => 'master' + :ref => 'stable/2024.2' mod 'ceilometer', :git => 'https://opendev.org/openstack/puppet-ceilometer', - :ref => 'master' + :ref => 'stable/2024.2' mod 'ceph', :git => 'https://opendev.org/openstack/puppet-ceph', @@ -19,111 +19,111 @@ mod 'ceph', mod 'cinder', :git => 'https://opendev.org/openstack/puppet-cinder', - :ref => 'master' + :ref => 'stable/2024.2' mod 'cloudkitty', :git => 'https://opendev.org/openstack/puppet-cloudkitty', - :ref => 'master' + :ref => 'stable/2024.2' mod 'designate', :git => 'https://opendev.org/openstack/puppet-designate', - :ref => 'master' + :ref => 'stable/2024.2' mod 'glance', :git => 'https://opendev.org/openstack/puppet-glance', - :ref => 'master' + :ref => 'stable/2024.2' mod 'gnocchi', :git => 'https://opendev.org/openstack/puppet-gnocchi', - :ref => 'master' + :ref => 'stable/2024.2' mod 'heat', :git => 'https://opendev.org/openstack/puppet-heat', - :ref => 'master' + :ref => 'stable/2024.2' mod 'horizon', :git => 'https://opendev.org/openstack/puppet-horizon', - :ref => 'master' + :ref => 'stable/2024.2' mod 'ironic', :git => 'https://opendev.org/openstack/puppet-ironic', - :ref => 'master' + :ref => 'stable/2024.2' mod 'keystone', :git => 'https://opendev.org/openstack/puppet-keystone', - :ref => 'master' + :ref => 'stable/2024.2' mod 'magnum', :git => 'https://opendev.org/openstack/puppet-magnum', - :ref => 'master' + :ref => 'stable/2024.2' mod 'manila', :git => 'https://opendev.org/openstack/puppet-manila', - :ref => 'master' + :ref => 'stable/2024.2' mod 'mistral', :git => 'https://opendev.org/openstack/puppet-mistral', - :ref => 'master' + :ref => 'stable/2024.2' mod 'neutron', :git => 'https://opendev.org/openstack/puppet-neutron', - :ref => 'master' + :ref => 'stable/2024.2' mod 'nova', :git => 'https://opendev.org/openstack/puppet-nova', - :ref => 'master' + :ref => 'stable/2024.2' mod 'octavia', :git => 'https://opendev.org/openstack/puppet-octavia', - :ref => 'master' + :ref => 'stable/2024.2' mod 'openstack_extras', :git => 'https://opendev.org/openstack/puppet-openstack_extras', - :ref => 'master' + :ref => 'stable/2024.2' mod 'openstacklib', :git => 'https://opendev.org/openstack/puppet-openstacklib', - :ref => 'master' + :ref => 'stable/2024.2' mod 'oslo', :git => 'https://opendev.org/openstack/puppet-oslo', - :ref => 'master' + :ref => 'stable/2024.2' mod 'ovn', :git => 'https://opendev.org/openstack/puppet-ovn', - :ref => 'master' + :ref => 'stable/2024.2' mod 'placement', :git => 'https://opendev.org/openstack/puppet-placement', - :ref => 'master' + :ref => 'stable/2024.2' mod 'swift', :git => 'https://opendev.org/openstack/puppet-swift', - :ref => 'master' + :ref => 'stable/2024.2' mod 'tempest', :git => 'https://opendev.org/openstack/puppet-tempest', - :ref => 'master' + :ref => 'stable/2024.2' mod 'trove', :git => 'https://opendev.org/openstack/puppet-trove', - :ref => 'master' + :ref => 'stable/2024.2' mod 'vswitch', :git => 'https://opendev.org/openstack/puppet-vswitch', - :ref => 'master' + :ref => 'stable/2024.2' mod 'vitrage', :git => 'https://opendev.org/openstack/puppet-vitrage', - :ref => 'master' + :ref => 'stable/2024.2' mod 'watcher', :git => 'https://opendev.org/openstack/puppet-watcher', - :ref => 'master' + :ref => 'stable/2024.2' mod 'zaqar', :git => 'https://opendev.org/openstack/puppet-zaqar', - :ref => 'master' + :ref => 'stable/2024.2' ## External modules mod 'kmod', @@ -184,7 +184,7 @@ mod 'memcached', mod 'dns', :git => 'https://github.com/theforeman/puppet-dns', - :ref => '11.0.0' + :ref => '12.1.0' mod 'archive', :git => 'https://github.com/voxpupuli/puppet-archive', @@ -196,7 +196,8 @@ mod 'ssh_keygen', mod 'redis', :git => 'https://github.com/voxpupuli/puppet-redis', - :ref => 'v11.0.0' + # NOTE(tkajinam): Temporal bump to fix broken idempotency + :ref => '27a95724b0a9597bbd9a314a96ff47da7eaaac18' mod 'systemd', :git => 'https://github.com/voxpupuli/puppet-systemd', diff --git a/configure_facts.sh b/configure_facts.sh index 745915fa..c6787fda 100644 --- a/configure_facts.sh +++ b/configure_facts.sh @@ -18,7 +18,7 @@ export OS_NAME_VERS=${ID}${VERSION_ID} # Write out facts to the facter folder when we generate them. export WRITE_FACTS=${WRITE_FACTS:-true} -export OPENSTACK_VERSION=${OPENSTACK_VERSION:-master} +export OPENSTACK_VERSION=${OPENSTACK_VERSION:-dalmatian} export DLRN_TAG=${DLRN_TAG:-puppet-passed-ci} export DLRN_ROOT=${DLRN_ROOT:-${OS_NAME_VERS}-${OPENSTACK_VERSION}} export DLRN_BASE=${DLRN_BASE:-${DLRN_ROOT}/${DLRN_TAG}} diff --git a/copy_logs.sh b/copy_logs.sh index 5067967e..0221cf24 100755 --- a/copy_logs.sh +++ b/copy_logs.sh @@ -170,9 +170,16 @@ if [ -d /etc/named ]; then if [ -f /etc/rndc.conf ]; then sudo cp -r /etc/rndc.conf $LOG_DIR/rndc.conf fi -elif [ -d /etc/bind ]; then +fi +if [ -d /etc/bind ]; then sudo cp -r /etc/bind $LOG_DIR/etc fi +if [ -f /etc/rndc.key ]; then + sudo cp /etc/rndc.key $LOG_DIR/etc +fi +if [ -f /etc/named.conf ]; then + sudo cp /etc/named.conf $LOG_DIR/etc +fi # tempest logs if [ -f /tmp/openstack/tempest/tempest.log ] ; then diff --git a/fixtures/scenario002.pp b/fixtures/scenario002.pp index f38eefb9..52286f08 100644 --- a/fixtures/scenario002.pp +++ b/fixtures/scenario002.pp @@ -28,7 +28,7 @@ $tooz_backend = 'redis' } 'RedHat': { - $ipv6 = false + $ipv6 = true $cache_backend = 'redis_sentinel' $django_cache_backend = 'redis' $tooz_backend = 'redis_sentinel' diff --git a/manifests/ceilometer.pp b/manifests/ceilometer.pp index aae12547..a3b7e815 100644 --- a/manifests/ceilometer.pp +++ b/manifests/ceilometer.pp @@ -27,7 +27,7 @@ class { 'ceilometer::cache': backend => $::openstack_integration::config::cache_driver, enabled => true, - memcache_servers => $::openstack_integration::config::memcached_servers, + memcache_servers => $::openstack_integration::config::memcache_servers, redis_server => $::openstack_integration::config::redis_server, redis_password => 'a_big_secret', redis_sentinels => $::openstack_integration::config::redis_sentinel_server, diff --git a/manifests/cinder.pp b/manifests/cinder.pp index 6db9f16f..5cd1f88c 100644 --- a/manifests/cinder.pp +++ b/manifests/cinder.pp @@ -162,7 +162,7 @@ manage_volume_type => true, } # make sure ceph pool exists before running Cinder Volume - Exec['create-cinder'] -> Service['cinder-volume'] + Ceph::Pool['cinder'] -> Service['cinder-volume'] } default: { fail("Unsupported backend (${backend})") @@ -191,7 +191,7 @@ backup_ceph_user => 'openstack', } # make sure ceph pool exists before running Cinder Backup - Exec['create-backups'] -> Service['cinder-backup'] + Ceph::Pool['backups'] -> Service['cinder-backup'] } default: {} } diff --git a/manifests/glance.pp b/manifests/glance.pp index 35fca958..9e6b3038 100644 --- a/manifests/glance.pp +++ b/manifests/glance.pp @@ -70,7 +70,7 @@ rbd_store_pool => 'glance', } # make sure ceph pool exists before running Glance API - Exec['create-glance'] -> Service['glance-api'] + Ceph::Pool['glance'] -> Service['glance-api'] $default_backend = 'rbd1' } 'swift': { diff --git a/manifests/gnocchi.pp b/manifests/gnocchi.pp index ab948307..e8cab4f1 100644 --- a/manifests/gnocchi.pp +++ b/manifests/gnocchi.pp @@ -108,7 +108,7 @@ manage_rados => true, } # make sure ceph pool exists before running gnocchi (dbsync & services) - Exec['create-gnocchi'] -> Exec['gnocchi-db-sync'] + Ceph::Pool['gnocchi'] -> Anchor['gnocchi::dbsync::begin'] } 'swift': { class { 'gnocchi::storage::swift': diff --git a/manifests/nova.pp b/manifests/nova.pp index 5ae2d7ef..5ae8606a 100644 --- a/manifests/nova.pp +++ b/manifests/nova.pp @@ -14,11 +14,6 @@ # Possible values include custom, host-model, none, host-passthrough. # Defaults to 'none' # -# [*modular_libvirt*] -# (optional) Use modular libvirt daemons instead of the monolithic libvirtd -# deamon -# Defaults to false -# # [*volume_encryption*] # (optional) Boolean to configure or not volume encryption # Defaults to false. @@ -39,7 +34,6 @@ $libvirt_rbd = false, $libvirt_virt_type = 'qemu', $libvirt_cpu_mode = 'none', - $modular_libvirt = false, $volume_encryption = false, $notification_topics = $facts['os_service_default'], $cinder_enabled = false, @@ -235,9 +229,8 @@ default => 'tcp' } class { 'nova::migration::libvirt': - transport => $migration_transport, - listen_address => $::openstack_integration::config::host, - modular_libvirt => $modular_libvirt, + transport => $migration_transport, + listen_address => $::openstack_integration::config::host, } $images_type = $libvirt_rbd ? { @@ -250,9 +243,7 @@ images_type => $images_type, manage_libvirt_services => false, } - class { 'nova::compute::libvirt::services': - modular_libvirt => $modular_libvirt, - } + class { 'nova::compute::libvirt::services': } class { 'nova::compute::libvirt::networks': } if $libvirt_rbd { class { 'nova::compute::rbd': @@ -265,7 +256,7 @@ manage_ceph_client => false, } # make sure ceph pool exists before running nova-compute - Exec['create-nova'] -> Service['nova-compute'] + Ceph::Pool['nova'] -> Service['nova-compute'] } else { include openstacklib::iscsid Service['iscsid'] -> Service['nova-compute'] diff --git a/manifests/repos.pp b/manifests/repos.pp index 583cf9a8..efd20f11 100644 --- a/manifests/repos.pp +++ b/manifests/repos.pp @@ -51,11 +51,11 @@ ) $delorean_repo = pick( $facts['delorean_repo_path'], - "https://trunk.rdoproject.org/centos${facts['os']['release']['major']}-master/puppet-passed-ci/delorean.repo" + "https://trunk.rdoproject.org/centos${facts['os']['release']['major']}-dalmatian/puppet-passed-ci/delorean.repo" ) $delorean_deps_repo = pick( $facts['delorean_deps_repo_path'], - "https://trunk.rdoproject.org/centos${facts['os']['release']['major']}-master/delorean-deps.repo" + "https://trunk.rdoproject.org/centos${facts['os']['release']['major']}-dalmatian/delorean-deps.repo" ) class { 'openstack_extras::repo::redhat::redhat': diff --git a/manifests/ssl_key.pp b/manifests/ssl_key.pp index 1091e155..3a529646 100644 --- a/manifests/ssl_key.pp +++ b/manifests/ssl_key.pp @@ -27,13 +27,13 @@ file { "/etc/${name}/ssl": ensure => directory, owner => $key_owner, - mode => '0775', + mode => '0750', selinux_ignore_defaults => true, } file { "/etc/${name}/ssl/private": ensure => directory, owner => $key_owner, - mode => '0755', + mode => '0750', require => File["/etc/${name}/ssl"], selinux_ignore_defaults => true, before => File[$_key_path] @@ -45,6 +45,6 @@ owner => $key_owner, source => "puppet:///modules/openstack_integration/ipv${openstack_integration::config::ip_version}.key", selinux_ignore_defaults => true, - mode => '0600', + mode => '0640', } } diff --git a/manifests/tempest.pp b/manifests/tempest.pp index d7a0506b..e53d6a1b 100644 --- a/manifests/tempest.pp +++ b/manifests/tempest.pp @@ -330,6 +330,7 @@ vitrage_available => $vitrage, gnocchi_available => $gnocchi, watcher_available => $watcher, + volume_catalog_type => 'volumev3', public_network_name => 'public', neutron_api_extensions => join(any2array($neutron_api_extensions_real), ','), dashboard_url => $dashboard_url, diff --git a/playbooks/prepare-node-common.yaml b/playbooks/prepare-node-common.yaml index 7f39d55d..289d7ea6 100644 --- a/playbooks/prepare-node-common.yaml +++ b/playbooks/prepare-node-common.yaml @@ -44,6 +44,7 @@ - zlib-devel - langpacks-en - glibc-langpack-en + - libffi-devel when: - ansible_os_family == 'RedHat' @@ -73,6 +74,7 @@ - libxslt-dev - ruby-dev - zlib1g-dev + - libffi-dev - python3-pip - name: Install Ruby dependencies (Debian) @@ -88,4 +90,5 @@ - libxslt1-dev - ruby-dev - zlib1g-dev + - libffi-dev - python3-pip diff --git a/playbooks/run-litmus-tests.yaml b/playbooks/run-litmus-tests.yaml index 5ae81809..c54cde03 100644 --- a/playbooks/run-litmus-tests.yaml +++ b/playbooks/run-litmus-tests.yaml @@ -20,7 +20,6 @@ export GEM_BIN_DIR=$GEM_HOME/bin ruby <