Merge "Update container-config-scripts/ folder content before update_tasks."
This commit is contained in:
commit
352a1ee4a3
|
@ -0,0 +1,17 @@
|
||||||
|
- name: Create /var/lib/container-config-scripts
|
||||||
|
become: true
|
||||||
|
file:
|
||||||
|
path: /var/lib/container-config-scripts
|
||||||
|
state: directory
|
||||||
|
setype: container_file_t
|
||||||
|
tags:
|
||||||
|
- container_config_scripts
|
||||||
|
|
||||||
|
- name: Write container config scripts
|
||||||
|
become: true
|
||||||
|
no_log: True
|
||||||
|
tripleo_container_config_scripts:
|
||||||
|
config_data: "{{ lookup('file', tripleo_role_name + '/container_config_scripts.yaml', errors='ignore') | default({}, True) | from_yaml }}"
|
||||||
|
config_dir: /var/lib/container-config-scripts
|
||||||
|
tags:
|
||||||
|
- container_config_scripts
|
|
@ -175,15 +175,6 @@
|
||||||
tags:
|
tags:
|
||||||
- container_config
|
- container_config
|
||||||
|
|
||||||
- name: Create /var/lib/container-config-scripts
|
|
||||||
become: true
|
|
||||||
file:
|
|
||||||
path: /var/lib/container-config-scripts
|
|
||||||
state: directory
|
|
||||||
setype: container_file_t
|
|
||||||
tags:
|
|
||||||
- container_config_scripts
|
|
||||||
|
|
||||||
# The container config files
|
# The container config files
|
||||||
# /var/lib/container-startup-configs.json is removed as we now write
|
# /var/lib/container-startup-configs.json is removed as we now write
|
||||||
# per-step files instead
|
# per-step files instead
|
||||||
|
@ -204,14 +195,7 @@
|
||||||
tags:
|
tags:
|
||||||
- container_startup_configs
|
- container_startup_configs
|
||||||
|
|
||||||
- name: Write container config scripts
|
- import_tasks: common_container_config_scripts.yaml
|
||||||
become: true
|
|
||||||
no_log: True
|
|
||||||
tripleo_container_config_scripts:
|
|
||||||
config_data: "{{ lookup('file', tripleo_role_name + '/container_config_scripts.yaml', errors='ignore') | default({}, True) | from_yaml }}"
|
|
||||||
config_dir: /var/lib/container-config-scripts
|
|
||||||
tags:
|
|
||||||
- container_config_scripts
|
|
||||||
|
|
||||||
# This file location is deprecated and the new location is now:
|
# This file location is deprecated and the new location is now:
|
||||||
# /var/lib/tripleo-config/container-startup-config/step_X/<container_name>.json
|
# /var/lib/tripleo-config/container-startup-config/step_X/<container_name>.json
|
||||||
|
|
|
@ -412,6 +412,7 @@ outputs:
|
||||||
keystone_resources: {get_param: KeystoneResourcesConfigs}
|
keystone_resources: {get_param: KeystoneResourcesConfigs}
|
||||||
common_deploy_steps_playbooks: {get_file: deploy-steps-playbooks-common.yaml}
|
common_deploy_steps_playbooks: {get_file: deploy-steps-playbooks-common.yaml}
|
||||||
common_deploy_steps_tasks: {get_file: deploy-steps-tasks.yaml}
|
common_deploy_steps_tasks: {get_file: deploy-steps-tasks.yaml}
|
||||||
|
common_container_config_scripts: {get_file: common-container-config-scripts.yaml}
|
||||||
hiera_steps_tasks: {get_file: hiera-steps-tasks.yaml}
|
hiera_steps_tasks: {get_file: hiera-steps-tasks.yaml}
|
||||||
deploy_steps_tasks_step_0: {get_file: deploy-steps-tasks-step-0.yaml}
|
deploy_steps_tasks_step_0: {get_file: deploy-steps-tasks-step-0.yaml}
|
||||||
common_deploy_steps_tasks_step_1: {get_file: deploy-steps-tasks-step-1.yaml}
|
common_deploy_steps_tasks_step_1: {get_file: deploy-steps-tasks-step-1.yaml}
|
||||||
|
@ -821,6 +822,7 @@ outputs:
|
||||||
tripleo_minor_update: true
|
tripleo_minor_update: true
|
||||||
tasks:
|
tasks:
|
||||||
- import_tasks: hiera_steps_tasks.yaml
|
- import_tasks: hiera_steps_tasks.yaml
|
||||||
|
- import_tasks: common_container_config_scripts.yaml
|
||||||
{%- for step in range(0,update_steps_max) %}
|
{%- for step in range(0,update_steps_max) %}
|
||||||
- import_tasks: "{{ role.name }}/update_tasks_step{{ step }}.yaml"
|
- import_tasks: "{{ role.name }}/update_tasks_step{{ step }}.yaml"
|
||||||
vars:
|
vars:
|
||||||
|
|
Loading…
Reference in New Issue