diff options
| author | Zuul <zuul@review.opendev.org> | 2021-12-02 15:42:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-12-02 15:42:37 +0000 |
| commit | 4ebdf54733be80afe2938ac7b6da9f749701730e (patch) | |
| tree | b031dab33fa9fc9e9954cbfdf8040b977ac24375 /tests | |
| parent | fa2a0d572bd195a56e3843e024ac1fdada8e1764 (diff) | |
| parent | feb70547c1e763124161bd4fe08f88749d76dbae (diff) | |
| download | kolla-ansible-4ebdf54733be80afe2938ac7b6da9f749701730e.tar.gz kolla-ansible-4ebdf54733be80afe2938ac7b6da9f749701730e.zip | |
Merge "[release] Set previous_release to xena"
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/templates/ansible.cfg.j2 | 4 | ||||
| -rw-r--r-- | tests/templates/globals-default.j2 | 12 | ||||
| -rw-r--r-- | tests/templates/inventory.j2 | 7 |
3 files changed, 1 insertions, 22 deletions
diff --git a/tests/templates/ansible.cfg.j2 b/tests/templates/ansible.cfg.j2 index 54f74ca5b..d652f6aeb 100644 --- a/tests/templates/ansible.cfg.j2 +++ b/tests/templates/ansible.cfg.j2 @@ -1,12 +1,8 @@ [defaults] callback_plugins = {{ ara_callback_plugins.stdout }} host_key_checking = False -# TODO(mgoddard): Add inject_facts_as_vars unconditionally when previous -# release is xena or previous release has had this patch backported. -{% if not is_upgrade or previous_release not in ["victoria", "wallaby"] %} # Ensure that facts are referenced via ansible_facts.<fact>. inject_facts_as_vars = False -{% endif %} [ssh_connection] pipelining = True diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2 index 72d74067f..5619b7817 100644 --- a/tests/templates/globals-default.j2 +++ b/tests/templates/globals-default.j2 @@ -33,12 +33,6 @@ enable_openstack_core: "{{ openstack_core_enabled }}" enable_horizon: "{{ dashboard_enabled }}" enable_heat: "{{ openstack_core_tested }}" -# TODO(mgoddard): Remove when previous release is Xena. -{% if is_previous_release and previous_release == "wallaby" and scenario != "cephadm" %} -# NOTE(mnasiadka): Test chrony cleanup in upgrade jobs -enable_chrony: "yes" -{% endif %} - {% if scenario != 'bifrost' %} kolla_internal_vip_address: "{{ kolla_internal_vip_address }}" neutron_external_interface: "{{ neutron_external_interface_name }}" @@ -130,7 +124,7 @@ glance_backend_ceph: "yes" cinder_backend_ceph: "yes" nova_backend_ceph: "yes" -enable_ceph_rgw: {{ not is_upgrade or previous_release != 'wallaby' }} +enable_ceph_rgw: "yes" ceph_rgw_hosts: {% for host in hostvars %} - host: {{ host }} @@ -151,12 +145,8 @@ openstack_cacert: "/etc/ssl/certs/ca-certificates.crt" openstack_cacert: "/etc/pki/tls/certs/ca-bundle.crt" {% endif %} kolla_admin_openrc_cacert: "{% raw %}{{ kolla_certificates_dir }}{% endraw %}/ca/root.crt" -# TODO(mgoddard): Remove the condition when Victoria supports RabbitMQ TLS, -# or the previous release is no longer Victoria. -{% if not is_upgrade or previous_release != "victoria" %} rabbitmq_enable_tls: "yes" {% endif %} -{% endif %} {% if scenario == 'linuxbridge' %} neutron_plugin_agent: "linuxbridge" diff --git a/tests/templates/inventory.j2 b/tests/templates/inventory.j2 index bef80fbb8..31563840d 100644 --- a/tests/templates/inventory.j2 +++ b/tests/templates/inventory.j2 @@ -147,13 +147,6 @@ compute [loadbalancer:children] network -{% if is_previous_release and previous_release == "wallaby" %} -[keepalived:children] -loadbalancer - -[haproxy:children] -loadbalancer -{% endif %} [mariadb:children] control |