From e9cff502aec72d88b2781c03ded68ff1a4abc100 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Kalu=C5=BEa?= Date: Mon, 19 Mar 2018 07:08:25 +0000 Subject: [PATCH] Revert "Do not copy default-modules to MBS backend, but import it from files directly." This reverts commit 23f6b3b6b9aaea49953dd04f2217d8846c287b30. --- ...latform-f28.yaml => platform-f28.yaml.staging} | 0 roles/mbs/common/tasks/main.yml | 15 ++++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) rename roles/mbs/common/files/{default-modules.staging/platform-f28.yaml => platform-f28.yaml.staging} (100%) diff --git a/roles/mbs/common/files/default-modules.staging/platform-f28.yaml b/roles/mbs/common/files/platform-f28.yaml.staging similarity index 100% rename from roles/mbs/common/files/default-modules.staging/platform-f28.yaml rename to roles/mbs/common/files/platform-f28.yaml.staging diff --git a/roles/mbs/common/tasks/main.yml b/roles/mbs/common/tasks/main.yml index e17779b71b..9027ebca2c 100644 --- a/roles/mbs/common/tasks/main.yml +++ b/roles/mbs/common/tasks/main.yml @@ -81,8 +81,21 @@ - mbs - mbs/common +- name: create /etc/module-build-service/default-modules directory + file: + path: /etc/module-build-service/default-modules + state: directory + owner: root + group: root + 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' } + - name: import default-modules command: /usr/bin/mbs-manager import_module {{ item }} with_fileglob: - - default-modules.{{ env }}/*.yaml + - /etc/module-build-service/default-modules/*.yaml