From e02cbc0fff397a18bb3442692a97660a6df1ef01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Kalu=C5=BEa?= Date: Mon, 19 Mar 2018 07:14:33 +0000 Subject: [PATCH] Use files/default-modules.{{ env }} to store default modules and copy them using fileglob. --- .../platform-f28.yaml} | 0 roles/mbs/common/tasks/main.yml | 10 +++++----- 2 files changed, 5 insertions(+), 5 deletions(-) rename roles/mbs/common/files/{platform-f28.yaml.staging => default-modules.staging/platform-f28.yaml} (100%) diff --git a/roles/mbs/common/files/platform-f28.yaml.staging b/roles/mbs/common/files/default-modules.staging/platform-f28.yaml similarity index 100% rename from roles/mbs/common/files/platform-f28.yaml.staging rename to roles/mbs/common/files/default-modules.staging/platform-f28.yaml diff --git a/roles/mbs/common/tasks/main.yml b/roles/mbs/common/tasks/main.yml index 9027ebca2c..f0a35f71a7 100644 --- a/roles/mbs/common/tasks/main.yml +++ b/roles/mbs/common/tasks/main.yml @@ -90,12 +90,12 @@ mode: 0775 - name: copy default modules to /etc/module-build-service/default-modules - copy: src={{ item.src }}.{{ env }} dest={{ item.dest }}/{{ item.src }} - with_items: - - { src: 'platform-f28.yaml', dest: '/etc/module-build-service/default-modules' } + copy: src={{ item }} dest=/etc/module-build-service/default-modules + with_fileglob: + - default-modules.{{ env }}/*.yaml - name: import default-modules - command: /usr/bin/mbs-manager import_module {{ item }} + command: /usr/bin/mbs-manager import_module /etc/module-build-service/default-modules/{{ item | filename }} with_fileglob: - - /etc/module-build-service/default-modules/*.yaml + - default-modules.{{ env }}/*.yaml