Merge "Don't log set_fact tasks for role_data"
This commit is contained in:
commit
2130e400cc
|
@ -17,6 +17,7 @@
|
||||||
path: "{{ role_name + '/step_config.pp' }}"
|
path: "{{ role_name + '/step_config.pp' }}"
|
||||||
register: stat_step_config
|
register: stat_step_config
|
||||||
- name: Set fact when file existed
|
- name: Set fact when file existed
|
||||||
|
no_log: True
|
||||||
set_fact:
|
set_fact:
|
||||||
role_data_step_config: "{{lookup('file', role_name + '/step_config.pp')}}"
|
role_data_step_config: "{{lookup('file', role_name + '/step_config.pp')}}"
|
||||||
when: stat_step_config.stat.exists
|
when: stat_step_config.stat.exists
|
||||||
|
@ -32,6 +33,7 @@
|
||||||
path: "{{ role_name + '/puppet_config.yaml' }}"
|
path: "{{ role_name + '/puppet_config.yaml' }}"
|
||||||
register: stat_puppet_config
|
register: stat_puppet_config
|
||||||
- name: Set fact when file existed
|
- name: Set fact when file existed
|
||||||
|
no_log: True
|
||||||
set_fact:
|
set_fact:
|
||||||
role_data_puppet_config: "{{lookup('file', role_name + '/puppet_config.yaml') | from_yaml | to_json}}"
|
role_data_puppet_config: "{{lookup('file', role_name + '/puppet_config.yaml') | from_yaml | to_json}}"
|
||||||
when: stat_puppet_config.stat.exists
|
when: stat_puppet_config.stat.exists
|
||||||
|
@ -55,6 +57,7 @@
|
||||||
path: "{{ role_name + '/docker_config_scripts.yaml' }}"
|
path: "{{ role_name + '/docker_config_scripts.yaml' }}"
|
||||||
register: stat_docker_config_scripts
|
register: stat_docker_config_scripts
|
||||||
- name: Set fact when file existed
|
- name: Set fact when file existed
|
||||||
|
no_log: True
|
||||||
set_fact:
|
set_fact:
|
||||||
role_data_docker_config_scripts: "{{lookup('file', role_name + '/docker_config_scripts.yaml') | from_yaml}}"
|
role_data_docker_config_scripts: "{{lookup('file', role_name + '/docker_config_scripts.yaml') | from_yaml}}"
|
||||||
when: stat_docker_config_scripts.stat.exists
|
when: stat_docker_config_scripts.stat.exists
|
||||||
|
@ -67,6 +70,7 @@
|
||||||
# FIXME We need to update the defaults e.g in docker-toool so we can remove the
|
# FIXME We need to update the defaults e.g in docker-toool so we can remove the
|
||||||
# docker-container-startup-configs.json and use per-step configs instead
|
# docker-container-startup-configs.json and use per-step configs instead
|
||||||
- name: Set docker_config_default fact
|
- name: Set docker_config_default fact
|
||||||
|
no_log: True
|
||||||
set_fact:
|
set_fact:
|
||||||
docker_config_default: "{{ docker_config_default|default({}) | combine( {'step_'+item: {}} ) }}"
|
docker_config_default: "{{ docker_config_default|default({}) | combine( {'step_'+item: {}} ) }}"
|
||||||
with_sequence: count={{deploy_steps_max}}
|
with_sequence: count={{deploy_steps_max}}
|
||||||
|
@ -77,10 +81,12 @@
|
||||||
path: "{{ role_name + '/docker_config.yaml' }}"
|
path: "{{ role_name + '/docker_config.yaml' }}"
|
||||||
register: stat_docker_config
|
register: stat_docker_config
|
||||||
- name: Set fact when file existed
|
- name: Set fact when file existed
|
||||||
|
no_log: True
|
||||||
set_fact:
|
set_fact:
|
||||||
role_data_docker_config: "{{lookup('file', role_name + '/docker_config.yaml') | from_yaml}}"
|
role_data_docker_config: "{{lookup('file', role_name + '/docker_config.yaml') | from_yaml}}"
|
||||||
when: stat_docker_config.stat.exists
|
when: stat_docker_config.stat.exists
|
||||||
- name: Set docker_startup_configs_with_default fact
|
- name: Set docker_startup_configs_with_default fact
|
||||||
|
no_log: True
|
||||||
set_fact:
|
set_fact:
|
||||||
docker_config_with_default: "{{docker_config_default | combine(role_data_docker_config)}}"
|
docker_config_with_default: "{{docker_config_default | combine(role_data_docker_config)}}"
|
||||||
- name: Write docker-container-startup-configs
|
- name: Write docker-container-startup-configs
|
||||||
|
@ -97,6 +103,7 @@
|
||||||
path: "{{ role_name + '/kolla_config.yaml' }}"
|
path: "{{ role_name + '/kolla_config.yaml' }}"
|
||||||
register: stat_kolla_config
|
register: stat_kolla_config
|
||||||
- name: Set fact when file existed
|
- name: Set fact when file existed
|
||||||
|
no_log: True
|
||||||
set_fact:
|
set_fact:
|
||||||
role_data_kolla_config: "{{lookup('file', role_name + '/kolla_config.yaml') | from_yaml}}"
|
role_data_kolla_config: "{{lookup('file', role_name + '/kolla_config.yaml') | from_yaml}}"
|
||||||
when: stat_kolla_config.stat.exists
|
when: stat_kolla_config.stat.exists
|
||||||
|
@ -120,6 +127,7 @@
|
||||||
path: "{{ role_name + '/docker_puppet_tasks.yaml' }}"
|
path: "{{ role_name + '/docker_puppet_tasks.yaml' }}"
|
||||||
register: stat_docker_puppet_tasks
|
register: stat_docker_puppet_tasks
|
||||||
- name: Set fact when file existed
|
- name: Set fact when file existed
|
||||||
|
no_log: True
|
||||||
set_fact:
|
set_fact:
|
||||||
role_data_docker_puppet_tasks: "{{lookup('file', role_name + '/docker_puppet_tasks.yaml') | from_yaml}}"
|
role_data_docker_puppet_tasks: "{{lookup('file', role_name + '/docker_puppet_tasks.yaml') | from_yaml}}"
|
||||||
when: stat_docker_puppet_tasks.stat.exists
|
when: stat_docker_puppet_tasks.stat.exists
|
||||||
|
|
Loading…
Reference in New Issue