Changed directories structure for tasks hitachienergy#536

to-bar · Oct 2, 2019 · 25f68bd · 25f68bd
1 parent 4a8fc8e
commit 25f68bd
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 4 deletions.
diff --git a/...s/roles/repository/tasks/setup-Debian.yml → ...s/roles/repository/tasks/Debian/setup.yml b/...s/roles/repository/tasks/setup-Debian.yml → ...s/roles/repository/tasks/Debian/setup.yml
diff --git a/...oles/repository/tasks/teardown-Debian.yml → ...oles/repository/tasks/Debian/teardown.yml b/...oles/repository/tasks/teardown-Debian.yml → ...oles/repository/tasks/Debian/teardown.yml
@@ -1,5 +1,4 @@
 ---
-
 - name: Enable system repositories and disable epirepo for offline mode
   block:
     - name: Enable system repositories
@@ -17,4 +16,4 @@
       shell: /tmp/{{ ansible_os_family }}/disable-epirepo-client-rh.sh
   when:
     - not groups['kubernetes_master'][0] == inventory_hostname
-    - offline_mode == false
+    - offline_mode == false
diff --git a/...s/roles/repository/tasks/setup-RedHat.yml → ...s/roles/repository/tasks/RedHat/setup.yml b/...s/roles/repository/tasks/setup-RedHat.yml → ...s/roles/repository/tasks/RedHat/setup.yml
diff --git a/...oles/repository/tasks/teardown-RedHat.yml → ...oles/repository/tasks/RedHat/teardown.yml b/...oles/repository/tasks/teardown-RedHat.yml → ...oles/repository/tasks/RedHat/teardown.yml
diff --git a/core/src/epicli/data/common/ansible/playbooks/roles/repository/tasks/setup.yml b/core/src/epicli/data/common/ansible/playbooks/roles/repository/tasks/setup.yml
@@ -71,4 +71,4 @@
     - inventory_hostname in groups['repository']
 
 - name: Set up repositories
-  include_tasks: "setup-{{ ansible_os_family }}.yml"
+  include_tasks: "{{ ansible_os_family }}/setup.yml"
diff --git a/core/src/epicli/data/common/ansible/playbooks/roles/repository/tasks/teardown.yml b/core/src/epicli/data/common/ansible/playbooks/roles/repository/tasks/teardown.yml
@@ -1,2 +1,2 @@
 - name: Re-enable system repositories and disable epirepo
-  include_tasks: teardown-{{ ansible_os_family }}.yml
+  include_tasks: "{{ ansible_os_family }}/teardown.yml"