diff options
author | Gordon Kelly <gordon.kelly@intel.com> | 2018-03-16 15:19:03 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2018-03-16 15:19:03 +0000 |
commit | 656d01c2c1c3e2e6562f04ebc47be82e777bf124 (patch) | |
tree | 81053f3bc7b7c9f1e5018cd40e10dfa66bbacb6e /docker/ansible/roles/config_files | |
parent | 613751ad5e14eb39852cfa308ca1aff5bf963b55 (diff) | |
parent | 59fd3ec9084f7cb6c2047c85ffd9e87cd32bd203 (diff) |
Merge "ansible: break task to copy additional config files to own file"
Diffstat (limited to 'docker/ansible/roles/config_files')
-rw-r--r-- | docker/ansible/roles/config_files/tasks/additional_configs.yml | 23 | ||||
-rw-r--r-- | docker/ansible/roles/config_files/tasks/main.yml | 11 |
2 files changed, 25 insertions, 9 deletions
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 |