diff --git a/.zuul.yaml b/.zuul.yaml index 32097272d..d671bd81f 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -68,7 +68,12 @@ delorean: "https://trunk.rdoproject.org/centos9-master/current/delorean.repo" delorean_deps: "https://trunk.rdoproject.org/centos9-master/delorean-deps.repo" pre-run: playbooks/packstack-centos9-pre.yaml + nodeset: + nodes: + - name: centos9s + label: centos-9-stream run: playbooks/packstack-integration-tempest.yaml + voting: false - job: name: packstack-multinode-centos8s @@ -95,7 +100,14 @@ delorean_deps: "https://trunk.rdoproject.org/centos9-master/delorean-deps.repo" pre-run: playbooks/packstack-centos9-pre.yaml post-run: playbooks/packstack-post-compute.yaml + nodeset: + nodes: + - name: controller + label: centos-9-stream + - name: compute + label: centos-9-stream run: playbooks/packstack-multinode.yaml + voting: false - job: name: packstack-centos8s-integration-scenario001 @@ -122,6 +134,31 @@ vars: scenario: scenario002 +- job: + name: packstack-centos9s-integration-scenario001 + parent: packstack-centos9 + vars: + scenario: scenario001 + +- job: + name: packstack-centos9s-integration-scenario002 + parent: packstack-centos9 + vars: + scenario: scenario002 + +- job: + name: packstack-centos9s-integration-scenario003 + parent: packstack-centos9 + vars: + scenario: scenario003 + +- job: + name: packstack-centos9s-multinode-scenario002-tempest + parent: packstack-multinode-centos9 + post-run: playbooks/packstack-post-compute.yaml + vars: + scenario: scenario002 + - secret: name: packstack_git_mirror_credentials data: @@ -214,6 +251,10 @@ - packstack-centos8s-integration-scenario002 - packstack-centos8s-integration-scenario003 - packstack-centos8s-multinode-scenario002-tempest + - packstack-centos9s-integration-scenario001 + - packstack-centos9s-integration-scenario002 + - packstack-centos9s-integration-scenario003 + - packstack-centos9s-multinode-scenario002-tempest gate: jobs: - openstack-tox-pep8 diff --git a/packstack/plugins/puppet_950.py b/packstack/plugins/puppet_950.py index ec39ade76..bb0f2ea63 100755 --- a/packstack/plugins/puppet_950.py +++ b/packstack/plugins/puppet_950.py @@ -234,6 +234,7 @@ def apply_puppet_manifest(config, messages): server.append("touch %s" % running_logfile) server.append("chmod 600 %s" % running_logfile) server.append("export PACKSTACK_VAR_DIR=%s" % host_dir) + server.append("export LANG=C.UTF-8") cmd = ("( flock %s/ps.lock " "puppet apply %s --modulepath %s/modules %s > %s " "2>&1 < /dev/null ; " diff --git a/packstack/puppet/modules/packstack/manifests/nova/compute.pp b/packstack/puppet/modules/packstack/manifests/nova/compute.pp index a4ad7303c..b247ce237 100644 --- a/packstack/puppet/modules/packstack/manifests/nova/compute.pp +++ b/packstack/puppet/modules/packstack/manifests/nova/compute.pp @@ -86,6 +86,7 @@ class packstack::nova::compute () instance_usage_audit_period => $instance_usage_audit_period, allow_resize_to_same_host => hiera('CONFIG_NOVA_ALLOW_RESIZE_TO_SAME'), force_config_drive => false, + mkisofs_cmd => 'mkisofs', } class { 'nova::placement': diff --git a/playbooks/packstack-centos9-pre.yaml b/playbooks/packstack-centos9-pre.yaml index c692ef087..a80e72895 100644 --- a/playbooks/packstack-centos9-pre.yaml +++ b/playbooks/packstack-centos9-pre.yaml @@ -19,8 +19,10 @@ rm -rf /etc/yum.repos.d/epel* dnf clean all sudo sed -i '/^exclude.*/d' /etc/dnf/dnf.conf + dnf -y install dnf-plugins-core + dnf config-manager --set-enabled crb dnf -y install libxml2-devel libxslt-devel ruby-devel zlib-devel - dnf -y install gcc gettext diffstat doxygen patch patchutils subversion systemtap git python3-setuptools wget redhat-lsb-core python3-libselinux virt-what yum + dnf -y install gcc gettext diffstat doxygen patch patchutils subversion systemtap git python3-setuptools wget python3-libselinux virt-what yum executable: /bin/bash chdir: '{{ ansible_user_dir }}/workspace' become: true