From ce35b43ab98f617f5c7ccb88a00d61cbe202f673 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Sun, 8 Nov 2020 11:24:12 +0100 Subject: [PATCH] Upgrade from Victoria Now that it has its own branch and published images. Depends-On: https://review.opendev.org/761822 Change-Id: I99924b52ee4e0aca1ca4c416190292e561b5c043 --- ansible/group_vars/all.yml | 2 +- tests/templates/globals-default.j2 | 3 --- zuul.d/base.yaml | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 360117927f..e3348bac1b 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -523,7 +523,7 @@ openstack_logging_debug: "False" openstack_region_name: "RegionOne" # Variable defined the pin_release_version, apply for rolling upgrade process -openstack_previous_release_name: "ussuri" +openstack_previous_release_name: "victoria" # A list of policy file formats that are supported by Oslo.policy supported_policy_format_list: diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2 index 84e85dffaa..d593a87731 100644 --- a/tests/templates/globals-default.j2 +++ b/tests/templates/globals-default.j2 @@ -61,9 +61,6 @@ openstack_tag_suffix: "{{ docker_image_tag_suffix }}" # of docker systemd command only once docker_custom_option: "--insecure-registry primary:4000" {% endif %} -{% if is_previous_release %} -openstack_release: "{{ previous_release }}" -{% endif %} {% endif %} {% if scenario == "zun" %} diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index dcdbcb5f32..ff5a3ae570 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -27,7 +27,7 @@ - ^kolla_ansible/tests/ - ^zuul\.d/ vars: - previous_release: ussuri + previous_release: victoria scenario: core virt_type: qemu is_upgrade: no