From aea1f70ed10bd9c9fa89122b17c8390152f6a017 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Thu, 13 Aug 2020 15:45:38 -0400 Subject: [PATCH] Create container config scripts with a new module Replace a complex copy/loop task by using a new module which will make logging better and deployment eventually a bit faster. Depends-On: https://review.opendev.org/746218 Change-Id: I3e8fae54aa1fb56ce8e3a5967aef7f751e9d2c6e (cherry picked from commit 1e1ea11be963f4dacd93847691458c14f5b32fab) --- common/deploy-steps-tasks-step-1.yaml | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/common/deploy-steps-tasks-step-1.yaml b/common/deploy-steps-tasks-step-1.yaml index 3b3f3b68fa..ee82f76f3b 100644 --- a/common/deploy-steps-tasks-step-1.yaml +++ b/common/deploy-steps-tasks-step-1.yaml @@ -224,21 +224,12 @@ tags: - container_startup_configs - - name: Write container config scripts - no_log: True become: true - copy: - content: "{{ item[1].content }}" - dest: "/var/lib/container-config-scripts/{{ item[0] }}" - force: yes - mode: "{{ item[1].mode | default('0600', true) }}" - setype: svirt_sandbox_file_t - loop: "{{ role_data_container_config_scripts | dictsort }}" - loop_control: - label: "{{ item[0] }}" - vars: - role_data_container_config_scripts: "{{ lookup('file', tripleo_role_name + '/container_config_scripts.yaml', errors='ignore') | default({}, True) | from_yaml }}" + 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