From 59fd3ec9084f7cb6c2047c85ffd9e87cd32bd203 Mon Sep 17 00:00:00 2001 From: Gordon Kelly Date: Fri, 16 Mar 2018 10:16:55 +0000 Subject: ansible: break task to copy additional config files to own file Change-Id: Iffba385bd8e565459288f95eadf8a52bb6cc0084 Signed-off-by: Gordon Kelly --- .../config_files/tasks/additional_configs.yml | 23 ++++++++++++++++++++++ docker/ansible/roles/config_files/tasks/main.yml | 11 ++--------- 2 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 docker/ansible/roles/config_files/tasks/additional_configs.yml diff --git a/docker/ansible/roles/config_files/tasks/additional_configs.yml b/docker/ansible/roles/config_files/tasks/additional_configs.yml new file mode 100644 index 00000000..28cad8a4 --- /dev/null +++ b/docker/ansible/roles/config_files/tasks/additional_configs.yml @@ -0,0 +1,23 @@ +#Copyright 2018 OPNFV and Intel Corporation +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +--- + +- name: copy additional configuration files to target system + template: + src: "{{ item }}" + dest: "{{ config_file_dir }}/{{ item | basename | regex_replace('\\.j2','') }}" + with_fileglob: + - "{{ additional_configs_path }}" + tags: + - copy_additional_configs diff --git a/docker/ansible/roles/config_files/tasks/main.yml b/docker/ansible/roles/config_files/tasks/main.yml index 7d3919a1..52535a09 100644 --- a/docker/ansible/roles/config_files/tasks/main.yml +++ b/docker/ansible/roles/config_files/tasks/main.yml @@ -74,12 +74,5 @@ - name: enable ipmi plugin include: ipmi.yml -- name: copy additional configuration files to target system - template: - src: "{{ item }}" - dest: "{{ config_file_dir }}/{{ item | basename | regex_replace('\\.j2','') }}" - tags: - - always - - copy_additional_configs - with_fileglob: - - "{{ additional_configs_path }}" +- name: copy additional config files + include: additional_configs.yml -- cgit 1.2.3-korg