Move kickstarts, scripts and snippets lists to defaults as vars.

This also moves all template related stuff into upload_templates.yml

Signed-off-by: Andrew Schoen <aschoen@redhat.com>

diff --git a/roles/cobbler/defaults/main.yml b/roles/cobbler/defaults/main.yml
new file mode 100644 (file)
index 0000000..4b23c67
--- /dev/null
+++ b/roles/cobbler/defaults/main.yml
@@ -0,0 +1,13 @@
+---
+kickstarts:
+  - cephlab_trusty.preseed
+  - cephlab_rhel.ks
+  
+snippets:
+  - cephlab_user
+  - cephlab_hostname
+  - cephlab_apt-mirror_hack
+  - cephlab_packages_rhel
+
+scripts:
+  - cephlab_preseed_late

diff --git a/roles/cobbler/tasks/main.yml b/roles/cobbler/tasks/main.yml
index d9a16c257bb77eda2267baaacc791be07d234d41..751c3ded30186ebbb7b9b5aeabfe97c02e4f8d05 100644 (file)
--- a/roles/cobbler/tasks/main.yml
+++ b/roles/cobbler/tasks/main.yml
@@ -1,40 +1,4 @@
 ---
-- name: Upload kickstarts and preseeds.
-  template:
-    src: "kickstarts/{{ item }}"
-    dest: "/var/lib/cobbler/kickstarts/{{ item }}"
-    owner: root
-    group: root
-    mode: 0644 
-  with_items:
-    - cephlab_trusty.preseed
-    - cephlab_rhel.ks
+- include: upload_templates.yml
   tags:
-    - kickstarts
-
-- name: Upload snippets
-  template:
-    src: "snippets/{{ item }}"
-    dest: "/var/lib/cobbler/snippets/{{ item }}"
-    owner: root
-    group: root
-    mode: 0644
-  with_items:
-    - cephlab_user
-    - cephlab_hostname
-    - cephlab_apt-mirror_hack
-    - cephlab_packages_rhel
-  tags:
-    - snippets
-
-- name: Upload scripts.
-  template:
-    src: "scripts/{{ item }}"
-    dest: "/var/lib/cobbler/scripts/{{ item }}"
-    owner: root
-    group: root
-    mode: 0644
-  with_items:
-    - cephlab_preseed_late
-  tags:
-    - scripts
+    - templates

diff --git a/roles/cobbler/tasks/upload_templates.yml b/roles/cobbler/tasks/upload_templates.yml
new file mode 100644 (file)
index 0000000..66a83f0
--- /dev/null
+++ b/roles/cobbler/tasks/upload_templates.yml
@@ -0,0 +1,33 @@
+---
+- name: Upload kickstarts and preseeds.
+  template:
+    src: "kickstarts/{{ item }}"
+    dest: "/var/lib/cobbler/kickstarts/{{ item }}"
+    owner: root
+    group: root
+    mode: 0644 
+  with_items: kickstarts
+  tags:
+    - kickstarts
+
+- name: Upload snippets
+  template:
+    src: "snippets/{{ item }}"
+    dest: "/var/lib/cobbler/snippets/{{ item }}"
+    owner: root
+    group: root
+    mode: 0644
+  with_items: snippets
+  tags:
+    - snippets
+
+- name: Upload scripts.
+  template:
+    src: "scripts/{{ item }}"
+    dest: "/var/lib/cobbler/scripts/{{ item }}"
+    owner: root
+    group: root
+    mode: 0644
+  with_items: scripts
+  tags:
+    - scripts