cobbler: Define a ks_dir

Cobbler2: /var/lib/cobbler/kickstarts
Cobbler3: /var/lib/cobbler/templates

Signed-off-by: David Galloway <dgallowa@redhat.com>

diff --git a/roles/cobbler/defaults/main.yml b/roles/cobbler/defaults/main.yml
index 69001574e1b907e1099b16aebd9a6e3a3208ca39..1709277153d8ce7f06443614aeeac97d2e4ba2cc 100644 (file)
--- a/roles/cobbler/defaults/main.yml
+++ b/roles/cobbler/defaults/main.yml
@@ -82,3 +82,5 @@ cobbler_settings_file: /etc/cobbler/settings
 kopts_flag: "--kopts"
 
 autoinstall_flag: "--kickstart"
+
+ks_dir: /var/lib/cobbler/kickstarts

diff --git a/roles/cobbler/tasks/upload_templates.yml b/roles/cobbler/tasks/upload_templates.yml
index 647adad3c23e956986504b3b1716e47ab1510aaf..dc503a88b107303bcd9adf2b06786b9cb97fed0a 100644 (file)
--- a/roles/cobbler/tasks/upload_templates.yml
+++ b/roles/cobbler/tasks/upload_templates.yml
@@ -23,7 +23,7 @@
 - name: Upload kickstarts and preseeds.
   template:
     src: "kickstarts/{{ item }}"
-    dest: "/var/lib/cobbler/kickstarts/{{ item }}"
+    dest: "{{ ks_dir }}/{{ item }}"
     owner: root
     group: root
     mode: 0644 

diff --git a/roles/cobbler/vars/dnf_systems.yml b/roles/cobbler/vars/dnf_systems.yml
index b2305f0586e53ca8d5947ad6b37de731049dc11c..dd8ac60d9a48dc25551ed9282c1092d4a6df6a20 100644 (file)
--- a/roles/cobbler/vars/dnf_systems.yml
+++ b/roles/cobbler/vars/dnf_systems.yml
@@ -31,3 +31,5 @@ kopts_flag: "--kernel-options"
 autoinstall_flag: "--autoinstall"
 
 autoinstall_meta_flag: "--autoinstall-meta"
+
+ks_dir: /var/lib/cobbler/templates

diff --git a/roles/cobbler_profile/tasks/update_kickstart.yml b/roles/cobbler_profile/tasks/update_kickstart.yml
index c7fba924d2bd6acc00c18780693ff8e456695140..6f364f55c9ca91348bba4b46d2ad7b52f9160168 100644 (file)
--- a/roles/cobbler_profile/tasks/update_kickstart.yml
+++ b/roles/cobbler_profile/tasks/update_kickstart.yml
@@ -1,7 +1,7 @@
 ---
 - name: Set kickstart path
   set_fact:
-    kickstart_path: /var/lib/cobbler/kickstarts/{{ distro.kickstart }}
+    kickstart_path: "{{ ks_dir }}/{{ distro.kickstart }}"
 
 - name: Check to see if the kickstart needs updating
   shell: cobbler profile dumpvars --name={{ distro_name }} | grep '^kickstart :' | awk '{ print $3 }'