openstack/kayobe
Code Issues Proposed changes

Fix variable shadowing

Browse Source 
previous_release variable is used for two different purposes in Zuul config.
Rename one to reflect its flagginess.

Change-Id: Ib7833b29ab2959db7c7ff85b90fb8a4f5082d864
This commit is contained in:
Mark Goddard 2018-11-06 15:08:23 +00:00
parent 73fb8c39c8
commit e9157c09e9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/kayobe-overcloud-upgrade-base/overrides.yml.j2
View File

@ -7,7 +7,7 @@ disable_selinux_do_reboot: false
docker_registry_mirrors: docker_registry_mirrors:
- "http://{{ zuul_site_mirror_fqdn }}:8081/registry-1.docker/" - "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_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_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 }}" kolla_ansible_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['git.openstack.org/openstack/kolla-ansible'].src_dir }}"

2
playbooks/kayobe-overcloud-upgrade-base/pre.yml
View File

@ -51,7 +51,7 @@
src: overrides.yml.j2 src: overrides.yml.j2
dest: "{{ previous_kayobe_config_src_dir }}/etc/kayobe/zz-overrides.yml" dest: "{{ previous_kayobe_config_src_dir }}/etc/kayobe/zz-overrides.yml"
vars: vars:
previous_release: true is_previous_release: true
# NOTE(mgoddard): The kayobe dev config by default expects a bridge - # NOTE(mgoddard): The kayobe dev config by default expects a bridge -
# breth1 - to exist with an IP address of 192.168.33.3. # breth1 - to exist with an IP address of 192.168.33.3.