From e9157c09e9fbc068baf6a16ae692a47b13f4566e Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Tue, 6 Nov 2018 15:08:23 +0000 Subject: [PATCH] Fix variable shadowing previous_release variable is used for two different purposes in Zuul config. Rename one to reflect its flagginess. Change-Id: Ib7833b29ab2959db7c7ff85b90fb8a4f5082d864 --- playbooks/kayobe-overcloud-upgrade-base/overrides.yml.j2 | 2 +- playbooks/kayobe-overcloud-upgrade-base/pre.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/playbooks/kayobe-overcloud-upgrade-base/overrides.yml.j2 b/playbooks/kayobe-overcloud-upgrade-base/overrides.yml.j2 index 7511dc16d..bbc149bab 100644 --- a/playbooks/kayobe-overcloud-upgrade-base/overrides.yml.j2 +++ b/playbooks/kayobe-overcloud-upgrade-base/overrides.yml.j2 @@ -7,7 +7,7 @@ disable_selinux_do_reboot: false docker_registry_mirrors: - "http://{{ zuul_site_mirror_fqdn }}:8081/registry-1.docker/" -{% if not previous_release | default(false) %} +{% if not is_previous_release | default(false) %} kolla_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['git.openstack.org/openstack/kolla'].src_dir }}" kolla_source_version: "{{ zuul.projects['git.openstack.org/openstack/kolla'].checkout }}" kolla_ansible_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['git.openstack.org/openstack/kolla-ansible'].src_dir }}" diff --git a/playbooks/kayobe-overcloud-upgrade-base/pre.yml b/playbooks/kayobe-overcloud-upgrade-base/pre.yml index ca86117f9..5d732e313 100644 --- a/playbooks/kayobe-overcloud-upgrade-base/pre.yml +++ b/playbooks/kayobe-overcloud-upgrade-base/pre.yml @@ -51,7 +51,7 @@ src: overrides.yml.j2 dest: "{{ previous_kayobe_config_src_dir }}/etc/kayobe/zz-overrides.yml" vars: - previous_release: true + is_previous_release: true # NOTE(mgoddard): The kayobe dev config by default expects a bridge - # breth1 - to exist with an IP address of 192.168.33.3.