openstack/tripleo-quickstart-extras
Code Issues Proposed changes

Remove all rocky related conditionals and tests after rocky End of Life

Browse Source 
Rocky is now EOL since [1][2] so this removes all the rocky related tests
or conditionals.
Related reviews in topic branch tripleo-ci-reduce-rocky [3].

[1] https://review.opendev.org/c/openstack/releases/+/774244
[2] http://lists.openstack.org/pipermail/openstack-discuss/2021-March/020912.html
[3] https://review.opendev.org/q/topic:tripleo-ci-reduce-rocky

Change-Id: Icb999fa6c8278bd54c200c73963b5e364c94c23d
This commit is contained in:
Marios Andreou 2021-03-24 13:39:15 +02:00
parent 37109c55aa
commit c2b0910fe1
34 changed files with 62 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
playbooks/baremetal-full-overcloud-prep.yml
View File

@ -43,7 +43,7 @@
name: tripleo_validations
when:
- (run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool)
- release not in ['queens', 'rocky', 'stein']
- release not in ['queens', 'stein']
- name: Prepare the overcloud images for deployment
hosts: undercloud
@ -82,4 +82,4 @@
name: tripleo_validations
when:
- (run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool)
- release not in ['queens', 'rocky', 'stein']
- release not in ['queens', 'stein']

2
playbooks/baremetal-full-overcloud.yml
View File

@ -33,4 +33,4 @@
name: tripleo_validations
when:
- (run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool)
- release not in ['queens', 'rocky', 'stein']
- release not in ['queens', 'stein']

2
playbooks/baremetal-full-undercloud.yml
View File

@ -19,7 +19,7 @@
name: tripleo_validations
when:
- (run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool)
- release not in ['queens', 'rocky', 'stein']
- release not in ['queens', 'stein']
- name: Validate the undercloud
hosts: undercloud

2
playbooks/multinode-multiple-overcloud.yml
View File

@ -81,7 +81,7 @@
name: tripleo_validations
when:
- (run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool)
- release not in ['queens', 'rocky', 'stein']
- release not in ['queens', 'stein']
######################################
# Run tempest on overcloud-two stack #

4
playbooks/multinode-overcloud-prep.yml
View File

@ -30,7 +30,7 @@
name: tripleo_validations
when:
- (run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool)
- release not in ['queens', 'rocky', 'stein']
- release not in ['queens', 'stein']
- name: Prepare for containerized deployment
hosts: undercloud
@ -54,7 +54,7 @@
name: tripleo_validations
when:
- (run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool)
- release not in ['queens', 'rocky', 'stein']
- release not in ['queens', 'stein']
- name: Ensure openvswitch is started and enabled
hosts: overcloud

2
playbooks/multinode-overcloud.yml
View File

@ -37,4 +37,4 @@
name: tripleo_validations
when:
- (run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool)
- release not in ['queens', 'rocky', 'stein']
- release not in ['queens', 'stein']

2
playbooks/multinode-standalone.yml
View File

@ -58,7 +58,7 @@
name: tripleo_validations
when:
- job.enable_validation|default(false)|bool
- release not in ['queens', 'rocky', 'stein']
- release not in ['queens', 'stein']
- name: Validate the undercloud
hosts: undercloud

2
playbooks/multinode-undercloud.yml
View File

@ -81,7 +81,7 @@
name: tripleo_validations
when:
- job.enable_validation|default(false)|bool
- release not in ['queens', 'rocky', 'stein']
- release not in ['queens', 'stein']
- name: Validate the undercloud
hosts: undercloud

4
playbooks/quickstart-extras-overcloud-prep.yml
View File

@ -38,7 +38,7 @@
name: tripleo_validations
when:
- (run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool)
- release not in ['queens', 'rocky', 'stein']
- release not in ['queens', 'stein']
# Prepare the overcloud flavor configuration
- name: Prepare overcloud flavors
@ -71,7 +71,7 @@
name: tripleo_validations
when:
- (run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool)
- release not in ['queens', 'rocky', 'stein']
- release not in ['queens', 'stein']
- name: Prepare the SSL Configuration for the overcloud deployment
hosts: undercloud

2
playbooks/quickstart-extras-overcloud.yml
View File

@ -31,7 +31,7 @@
name: tripleo_validations
when:
- (run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool)
- release not in ['queens', 'rocky', 'stein']
- release not in ['queens', 'stein']
# Check the results of the deployment, note after inventory has executed
- name: Check the result of the deployment

2
playbooks/quickstart-extras-undercloud.yml
View File

@ -40,7 +40,7 @@
name: tripleo_validations
when:
- (run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool)
- release not in ['queens', 'rocky', 'stein']
- release not in ['queens', 'stein']
- name: Download amphora image for octavia
hosts: undercloud

6
playbooks/tasks/tempest.yml
View File

@ -58,7 +58,7 @@
- name: Set the rc file
set_fact:
rc_file: "{{ (tempest_cloud_name in ['undercloud']) | ternary('stackrc', 'overcloudrc') }}"
when: release in ['queens', 'rocky', 'stein']
when: release in ['queens', 'stein']
- name: Create clouds.yaml if it doesn't exist
shell: |
@ -80,7 +80,7 @@
project_name: $OS_PROJECT_NAME
EOF
when:
- release in ['queens', 'rocky', 'stein']
- release in ['queens', 'stein']
- not tempest_cloud_name in ['standalone']
# Ansible requires openstacksdk>=0.12 do the resource setup, however
@ -159,7 +159,7 @@
tempest_public_subnet_allocation_pools: '{{ tempest_cidr|nthhost(100) ~ "-" ~ tempest_cidr|nthhost(150) }}'
tempest_private_net_seg_id: "{{ (release in ['queens']) | ternary('', omit) }}"
tempest_network_ping_gateway: true
tempest_private_net_provider_type: "{{ (release in ['queens', 'rocky']) | ternary('vlan', 'geneve') }}"
tempest_private_net_provider_type: "{{ (release in ['queens']) | ternary('vlan', 'geneve') }}"
when: tempest_cidr is defined
- name: Handle migration of br-ex network

2
playbooks/validations.yml
View File

@ -10,4 +10,4 @@
name: tripleo_validations
when:
- job.enable_validation|default(false)|bool
- release not in ['queens', 'rocky', 'stein']
- release not in ['queens', 'stein']

2
roles/container-build/defaults/main.yaml
View File

@ -23,7 +23,7 @@ container_file: /usr/share/openstack-tripleo-common/container-images/tripleo_con
docker_prep_prefix: >-
{% if (build_container_images|default(false)|bool and
not job.provider_job|default(false)|bool) or
release not in ['queens', 'rocky', 'pike', 'stein', 'train', 'ussuri'] -%}
release not in ['queens', 'pike', 'stein', 'train', 'ussuri'] -%}
openstack
{%- else -%}
{{ ansible_distribution | lower }}-binary

23
roles/extras-common/defaults/main.yml
View File

@ -28,12 +28,7 @@ containerized_overcloud_upgrade: >-
{%- else -%}
true
{%- endif -%}
undercloud_container_cli: >-
{% if release in ['rocky'] -%}
docker
{%- else -%}
podman
{%- endif -%}
undercloud_container_cli: podman
# the variable is only used in overcloud-deploy role
# for stein and beyond, so it's safe to set it to podman,
# as for stable branches before stein the variable won't be used.
@ -56,7 +51,7 @@ build_container_images: "{{ job.build_container_images|default(false)|bool }}"
docker_prep_prefix: >-
{% if (build_container_images|default(false)|bool and
not job.provider_job|default(false)|bool) or
release not in ['queens', 'rocky', 'pike', 'stein', 'train', 'ussuri'] -%}
release not in ['queens', 'pike', 'stein', 'train', 'ussuri'] -%}
openstack
{%- else -%}
{{ ansible_distribution | lower }}-binary
@ -73,7 +68,7 @@ docker_ceph_image: daemon
docker_ceph_tag: >-
{% if release in ['pike'] -%}
v3.0.3-stable-3.0-jewel-centos-7-x86_64
{%- elif release in ['queens','rocky'] -%}
{%- elif release in ['queens'] -%}
v3.2.14-stable-3.2-luminous-centos-7-x86_64
{%- elif release in ['stein','train','ussuri','victoria'] -%}
v4.0.13-stable-4.0-nautilus-centos-7-x86_64
@ -132,14 +127,14 @@ network_provision: false
# If `undercloud_enable_nova` is `true`, the undercloud will have running glance and nova services
undercloud_enable_nova: >-
{% if release in ['queens', 'rocky', 'stein', 'train', 'ussuri'] -%}
{% if release in ['queens', 'stein', 'train', 'ussuri'] -%}
true
{%- else -%}
false
{%- endif %}
step_overcloud_prep_flavors: >-
{% if release in ['newton','ocata','pike','queens','rocky','stein','train', 'ussuri'] -%}
{% if release in ['newton','ocata','pike','queens','stein','train', 'ussuri'] -%}
true
{%- else -%}
false
@ -147,26 +142,26 @@ step_overcloud_prep_flavors: >-
# Set the location for the downloaded amphora image when download_amphora is true
octavia_amphora_path: >-
{% if release in ['queens', 'rocky'] -%}
{% if release in ['queens'] -%}
/usr/share/openstack-octavia-amphora-images/amphora-x64-haproxy.qcow2
{%- else -%}
{{ working_dir }}/amphora.qcow2
{%- endif %}
undercloud_enable_mistral: >-
{% if release in ['queens', 'rocky', 'stein', 'train'] -%}
{% if release in ['queens', 'stein', 'train'] -%}
true
{%- else -%}
false
{%- endif %}
undercloud_enable_zaqar: >-
{% if release in ['queens', 'rocky', 'stein', 'train'] -%}
{% if release in ['queens', 'stein', 'train'] -%}
true
{%- else -%}
false
{%- endif %}
undercloud_enable_swift: >-
{% if release in ['queens', 'rocky', 'stein', 'train', 'ussuri', 'victoria'] -%}
{% if release in ['queens', 'stein', 'train', 'ussuri', 'victoria'] -%}
true
{%- else -%}
false

2
roles/overcloud-deploy/defaults/main.yml
View File

@ -116,7 +116,7 @@ selinux_args: ""
deploy_args: >-
{{ libvirt_args }}
{{ flavor_args if release in ['newton','ocata','pike','queens','rocky','stein'] else '' }}
{{ flavor_args if release in ['newton','ocata','pike','queens','stein'] else '' }}
{{ timeout_args }}
{{ ntp_args }}
{{ cloud_name_args }}

10
roles/overcloud-deploy/tasks/pre-deploy.yml
View File

@ -238,18 +238,18 @@
- name: set container_args fact
set_fact:
container_args: >-
{% if release in ['pike', 'queens', 'rocky'] %}
{% if release in ['pike', 'queens'] %}
-e {{ overcloud_templates_path }}/environments/docker.yaml
{% endif %}
{% if enable_pacemaker|bool or osp_release is defined%}
-e {{ overcloud_templates_path }}/environments/docker-ha.yaml
{% endif %}
{% if release in ['ocata', 'pike', 'queens', 'rocky'] %}
{% if release in ['ocata', 'pike', 'queens'] %}
-e {{ working_dir }}/containers-default-parameters.yaml
{% else %}
-e {{ working_dir }}/containers-prepare-parameter.yaml
{% endif %}
{% if release not in ['pike', 'queens', 'rocky'] %}
{% if release not in ['pike', 'queens'] %}
-e {{ overcloud_templates_path }}/environments/{{ overcloud_container_cli }}.yaml
{% endif %}
when:
@ -282,7 +282,7 @@
set_fact:
multinode_args: >-
-e {{ overcloud_templates_path }}/environments/deployed-server-environment.yaml
{% if release in ['queens', 'rocky', 'stein'] and overcloud_release|default('') in ['queens', 'rocky', 'stein'] %}
{% if release in ['queens', 'stein'] and overcloud_release|default('') in ['queens', 'stein'] %}
-e {{ overcloud_templates_path }}/environments/deployed-server-bootstrap-environment-centos.yaml
{% endif %}
--overcloud-ssh-user {{ undercloud_user }}
@ -296,7 +296,7 @@
hypervisor_wait: false
multinode_args: >-
-e {{ overcloud_templates_path }}/environments/deployed-server-environment.yaml
{% if release in ['queens', 'rocky', 'stein'] and overcloud_release|default('') in ['queens', 'rocky', 'stein'] %}
{% if release in ['queens', 'stein'] and overcloud_release|default('') in ['queens', 'stein'] %}
-e {{ overcloud_templates_path }}/environments/deployed-server-bootstrap-environment-centos.yaml
{% endif %}
-e {{ working_dir }}/overcloud-baremetal-deployed.yaml

2
roles/overcloud-deploy/templates/overcloud-deploy-cell.sh.j2
View File

@ -70,7 +70,7 @@ elif ! openstack stack list | grep {{ cell_name }} | grep -Eq '(CREATE|UPDATE)_C
# We need to exit with 1 because of the above || true
done
exit 1
{%if release in ['rocky', 'master'] %}
{%if release in ['master'] %}
elif ! openstack overcloud status --stack {{ cell_name }}| grep -Eq 'DEPLOY_SUCCESS'; then
# NOTE(emilien) "openstack overcloud failures" was introduced in Rocky
openstack overcloud failures --stack {{ cell_name }}>> {{ failed_cell_deployment_list }} || true

4
roles/overcloud-deploy/templates/overcloud-deploy-post.sh.j2
View File

@ -9,7 +9,7 @@ set -eux
## * Prepare Your Environment.
## ::
{% if release in ['mitaka', 'newton', 'ocata', 'pike', 'queens', 'rocky', 'stein'] -%}
{% if release in ['mitaka', 'newton', 'ocata', 'pike', 'queens', 'stein'] -%}
HOSTFILE=/etc/hosts
{% endif -%}
@ -18,7 +18,7 @@ HOSTFILE=/etc/hosts
. {{ working_dir }}/stackrc
{% if release in ['mitaka', 'newton', 'ocata', 'pike', 'queens', 'rocky', 'stein'] -%}
{% if release in ['mitaka', 'newton', 'ocata', 'pike', 'queens', 'stein'] -%}
## * Remove any old overcloud host entries from `/etc/hosts`.
## ::

2
roles/overcloud-deploy/templates/overcloud-deploy.sh.j2
View File

@ -88,7 +88,7 @@ elif ! openstack stack list | grep -Eq '(CREATE|UPDATE)_COMPLETE'; then
# We need to exit with 1 because of the above || true
done
exit 1
{%if release in ['rocky', 'master'] %}
{%if release in ['master'] %}
elif ! openstack overcloud status --plan {{ stack_name }} | grep -Eq 'DEPLOY_SUCCESS'; then
# NOTE(emilien) "openstack overcloud failures" was introduced in Rocky
openstack overcloud failures --plan {{ stack_name }} >> {{ failed_deployment_list }} || true

4
roles/overcloud-prep-containers/tasks/main.yml
View File

@ -16,9 +16,9 @@
- include: create-scripts.yml
tags:
- undercloud-scripts
when: release in ['ocata', 'pike', 'queens', 'rocky']
when: release in ['ocata', 'pike', 'queens']
- include: overcloud-prep-containers.yml
tags:
- containers
when: release in ['ocata', 'pike', 'queens', 'rocky']
when: release in ['ocata', 'pike', 'queens']

2
roles/overcloud-prep-images/tasks/create-scripts.yml
View File

@ -69,5 +69,5 @@
dest: "{{ working_dir }}/inject-ara.sh"
mode: 0755
when:
- release not in ['newton', 'ocata', 'pike', 'queens', 'rocky']
- release not in ['newton', 'ocata', 'pike', 'queens']
- undercloud_enable_mistral|bool

6
roles/overcloud-prep-images/tasks/overcloud-prep-images.yml
View File

@ -37,7 +37,7 @@
block:
- name: Import and register overcloud nodes - legacy
when:
- release in ['queens', 'rocky', 'stein', 'train']
- release in ['queens', 'stein', 'train']
shell: >
set -o pipefail &&
{{ working_dir }}/overcloud-import-nodes.sh 2>&1 {{ timestamper_cmd }} >
@ -46,7 +46,7 @@
- name: Run import nodes via tripleo-operator-ansible
when:
- release not in ['queens', 'rocky', 'stein', 'train']
- release not in ['queens', 'stein', 'train']
collections:
- tripleo.operator
include_role:
@ -122,5 +122,5 @@
{{ inject_ara_log }}
changed_when: true
when:
- release not in ['newton', 'ocata', 'pike', 'queens', 'rocky']
- release not in ['newton', 'ocata', 'pike', 'queens']
- undercloud_enable_mistral|bool

2
roles/overcloud-prep-images/templates/overcloud-prep-images.sh.j2
View File

@ -32,6 +32,6 @@ source {{ working_dir }}/stackrc
{% if step_introspect|bool %}
{% include 'overcloud-introspect.sh.j2' %}
{% endif %}
{% if release not in ['newton', 'ocata', 'pike', 'queens', 'rocky'] and undercloud_enable_mistral|bool %}
{% if release not in ['newton', 'ocata', 'pike', 'queens'] and undercloud_enable_mistral|bool %}
{% include 'inject-ara.sh.j2' %}
{% endif %}

2
roles/standalone-upgrade/tasks/main.yml
View File

@ -26,7 +26,7 @@
- name: Check whether control plane defaults to HA
set_fact:
standalone_upgrade_ha_control_plane: "{{ release not in ['newton', 'ocata', 'pike', 'queens', 'rocky', 'stein', 'train'] }}"
standalone_upgrade_ha_control_plane: "{{ release not in ['newton', 'ocata', 'pike', 'queens', 'stein', 'train'] }}"
- name: Create the upgrade command for standalone
template:

8
roles/standalone/tasks/containers.yml
View File

@ -68,7 +68,7 @@
- name: Run container prepare legacy
when:
- release in ['queens', 'rocky', 'stein', 'train']
- release in ['queens', 'stein', 'train']
block:
- name: Create container parameters script
@ -85,7 +85,7 @@
- name: Run container prepare via tripleo-operator-ansible
when:
- release not in ['queens', 'rocky', 'stein', 'train']
- release not in ['queens', 'stein', 'train']
collections:
- tripleo.operator
include_role:
@ -240,7 +240,7 @@
{% set _ = item.__setitem__("modify_role", "tripleo-modify-image") %}
{% set _ = item.__setitem__("modify_append_tag", update_containers_append_tag) %}
{% if not (osp_release is defined) %}
{% if release in ['rocky', 'stein'] %}
{% if release in ['stein'] %}
{% set _ = item.__setitem__("modify_only_with_labels", ["kolla_version"]) %}
{% else %}
{% set _ = item.__setitem__("modify_only_with_source", ["kolla", "tripleo"]) %}
@ -286,7 +286,7 @@
- standalone_container_prep_updates
- ansible_distribution == 'RedHat'
- ansible_distribution_major_version|int >= 8
- release not in ['newton', 'ocata', 'pike', 'queens', 'rocky']
- release not in ['newton', 'ocata', 'pike', 'queens']
replace:
path: "{{ working_dir }}/standalone_parameters.yaml"
regexp: " - 192.168.24.1:8787"

4
roles/standalone/tasks/standalone-install.yml
View File

@ -1,7 +1,7 @@
---
- name: Check whether control plane defaults to HA
set_fact:
tripleo_deploy_ha_control_plane: "{{ release not in ['newton', 'ocata', 'pike', 'queens', 'rocky', 'stein', 'train'] }}"
tripleo_deploy_ha_control_plane: "{{ release not in ['newton', 'ocata', 'pike', 'queens', 'stein', 'train'] }}"
- name: Run standalone via tripleo-operator-ansible
collections:
@ -29,7 +29,7 @@
{% endif %}
{{ env_files }}
# NOTE(mwhahaha): option no longer required as of V.
tripleo_deploy_standalone: "{{ release in ['rocky', 'stein', 'train', 'ussuri'] }}"
tripleo_deploy_standalone: "{{ release in ['stein', 'train', 'ussuri'] }}"
- when: standalone_ansible_lint|default(false)|bool
vars:

2
roles/undercloud-deploy/defaults/main.yml
View File

@ -93,7 +93,7 @@ undercloud_selinux_enabled: >-
{%- endif -%}
undercloud_container_cli: >-
{% if release not in ['newton', 'ocata', 'pike', 'queens', 'rocky'] -%}
{% if release not in ['newton', 'ocata', 'pike', 'queens'] -%}
podman
{% else %}
docker

2
roles/undercloud-deploy/tasks/tripleo-ui.yml
View File

@ -116,7 +116,7 @@
dest: /var/www/openstack-tripleo-ui/dist/tripleo_ui_config.js
backup: true
become: true
when: release in ['master', 'rocky', 'queens', 'pike']
when: release in ['master', 'queens', 'pike']
- name: restart the httpd service
service:

6
roles/undercloud-deploy/templates/containers-prepare-parameter.yaml.j2
View File

@ -16,7 +16,7 @@ parameter_defaults:
and not job.consumer_job | default(false) | bool %}
modify_role: tripleo-modify-image
modify_append_tag: "{{ update_containers_append_tag }}"
{% if release in ['rocky', 'stein'] %}
{% if release in ['stein'] %}
modify_only_with_labels:
- kolla_version
{% else %}
@ -27,11 +27,11 @@ parameter_defaults:
modify_vars:
tasks_from: yum_update.yml
yum_repos_dir_path: /etc/yum.repos.d
{% if release not in ['pike','queens','rocky','stein'] and podman_version is version('1.5.0', '>=') %}
{% if release not in ['pike','queens','stein'] and podman_version is version('1.5.0', '>=') %}
yum_cache: /var/tmp/tripleo-container-image-prepare-cache
{% endif %}
update_repo: "{{ update_containers_repo }}"
{% if release not in ['newton', 'ocata', 'pike', 'queens', 'rocky'] %}
{% if release not in ['newton', 'ocata', 'pike', 'queens'] %}
container_build_tool: buildah
{% endif %}
{% endif %}

4
roles/undercloud-deploy/templates/undercloud.conf.j2
View File

@ -211,7 +211,7 @@ inspection_runbench = {{undercloud_inspection_runbench}}
# services. (boolean value)
undercloud_debug = {{undercloud_undercloud_debug}}
{% if containerized_undercloud|bool and release != 'rocky' %}
{% if containerized_undercloud|bool %}
# Container CLI used for deployment;
# Can be docker or podman. (string value)
container_cli = {{undercloud_container_cli}}
@ -624,7 +624,7 @@ dhcp_start = {{undercloud_dhcp_start|default(
dhcp_end = {{undercloud_dhcp_end|default(
undercloud_network_cidr|nthhost(30))}}
{% if release not in ['queens', 'rocky', 'stein'] %}
{% if release not in ['queens', 'stein'] %}
# DNS nameservers for the Neutron-managed subnet for the Overcloud
# instances on this network. If no nameservers are defined for the
# subnet, the nameservers defined for undercloud_nameservers will be

3
roles/validate-tempest/defaults/main.yml
View File

@ -80,10 +80,9 @@ tempest_version_dict:
ocata: '16.1.0'
pike: '17.1.0'
queens: '17.2.0'
rocky: '19.0.0'
master: 'master'
tempest_version: "{{ tempest_version_dict[release] }}"
tempest_conf_version_dict: {'ocata': '1.1.3', 'pike': '1.1.3', 'queens': '1.1.4', 'rocky': 'master', 'master': 'master'}
tempest_conf_version_dict: {'ocata': '1.1.3', 'pike': '1.1.3', 'queens': '1.1.4', 'master': 'master'}
tempest_conf_version: "{{ tempest_conf_version_dict[release] }}"
tempestmail_config: config.yaml
tempestmail_log_server: http://logs.openstack.org

2
roles/validate-tempest/templates/configure-tempest.sh.j2
View File

@ -183,7 +183,7 @@ $TEMPESTCONF --out etc/tempest.conf \
auth.use_dynamic_credentials true \
network-feature-enabled.port_security true \
{% endif %}
{% if release in ['queens', 'rocky'] %}
{% if release in ['queens'] %}
compute-feature-enabled.scheduler_available_filters RetryFilter,AvailabilityZoneFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter,PciPassthroughFilter \
{% endif %}
{% if release in ['newton', 'ocata', 'pike', 'queens'] %}

2
roles/validate-tempest/templates/run-tempest.sh.j2
View File

@ -72,7 +72,7 @@ sudo cp \
sudo cp -Rf {{ working_dir }}/.config $TEMPEST_HOST_DATA
{% endif %}
{% if release not in ['newton', 'ocata', 'pike', 'queens', 'rocky'] %}
{% if release not in ['newton', 'ocata', 'pike', 'queens'] %}
export CONTAINER_BINARY='podman'
{% else %}
export CONTAINER_BINARY='docker'