openstack/tripleo-heat-templates
Code Issues Proposed changes

Include {{step}} when setting facts

Browse Source 
We don't set the fact specific to a step and it seems
to run those puppet tasks for subsequent steps too.

Change-Id: Ic276ea6f34dd638ad66505aa77bddff0e4071ad4
Closes-Bug #1870291
This commit is contained in:
Rabi Mishra 2020-04-02 12:51:21 +05:30
parent 676643ed7d
commit 6db0ac0856
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/deploy-steps-tasks.yaml
View File

@ -162,8 +162,8 @@
- name: Calculate container_puppet_tasks for {{ansible_hostname | lower}} step {{step}}
set_fact:
host_container_puppet_tasks: "{{host_container_puppet_tasks|default([]) + [item]}}"
loop: "{{container_puppet_tasks.get('step_' + step, [])}}"
"{{'host_container_puppet_tasks_' ~ step}}": "{{lookup('vars', 'host_container_puppet_tasks_' ~ step, default=[]) | union([item])}}"
loop: "{{container_puppet_tasks.get('step_' ~ step, [])}}"
when: (groups[item.service_name] | default ([]) | map('extract', hostvars, 'inventory_hostname') | sort | first | lower) == ansible_hostname | lower
vars:
container_puppet_tasks: "{{ lookup('file', tripleo_role_name + '/container_puppet_tasks.yaml', errors='ignore') | default({}, True) | from_yaml }}"
@ -172,6 +172,6 @@
- name: Include container-puppet tasks for step {{step}}
include_tasks: host-container-puppet-tasks.yaml
when: host_container_puppet_tasks is defined
when: ('host_container_puppet_tasks_' ~ step) is defined
tags:
- container_config_tasks

2
common/host-container-puppet-tasks.yaml
View File

@ -1,7 +1,7 @@
- name: Write container-puppet-tasks json file for {{ansible_hostname | lower}} step {{step}}
no_log: True
copy:
content: "{{host_container_puppet_tasks|to_nice_json}}"
content: "{{lookup ('vars', 'host_container_puppet_tasks_' ~ step, default=[]) | to_nice_json}}"
dest: "/var/lib/container-puppet/container-puppet-tasks{{step}}.json"
force: yes
mode: '0600'