From: Zack Cerza <zack@redhat.com>
Date: Tue, 21 Jul 2015 23:40:55 +0000 (-0600)
Subject: Cobbler: write users.digest base on a var
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f69416c9f2d93223b53b550fd6befa3c5cb20d99;p=ceph-cm-ansible.git

Cobbler: write users.digest base on a var

... instead of a template, so we can add users on a per-lab basis.

Signed-off-by: Zack Cerza <zack@redhat.com>
---

diff --git a/roles/cobbler/defaults/main.yml b/roles/cobbler/defaults/main.yml
index a8ff0d4..87cb584 100644
--- a/roles/cobbler/defaults/main.yml
+++ b/roles/cobbler/defaults/main.yml
@@ -4,8 +4,8 @@ iso_dir: /var/lib/cobbler/isos
 # Mount point to use for ISOs during import
 iso_mount: /mnt/iso
 
-etc_cobbler_files:
- - users.digest
+users_digest_lines:
+ - "cobbler:Cobbler:a4fa62c1597fca6d8cf27b1325b0ae6a"
 
 settings:
   - name: yum_post_install_mirror
diff --git a/roles/cobbler/tasks/settings.yml b/roles/cobbler/tasks/settings.yml
index 22f421d..f4bb0ed 100644
--- a/roles/cobbler/tasks/settings.yml
+++ b/roles/cobbler/tasks/settings.yml
@@ -1,4 +1,13 @@
 ---
+- name: Write users.digest
+  copy:
+    content: "{% for line in users_digest_lines %}{{ line + '\n' }}{% endfor %}"
+    dest: /etc/cobbler/users.digest
+    owner: root
+    group: root
+    mode: 0600
+  register: users_digest
+
 - name: Enable dynamic settings modification
   lineinfile:
     dest: /etc/cobbler/settings
@@ -16,7 +25,7 @@
   register: server_value
 
 - include: restart.yml
-  when: dynamic_settings|changed or server_value|changed
+  when: users_digest|changed or dynamic_settings|changed or server_value|changed
 
 - name: Update settings
   command: cobbler setting edit --name={{ item.name }} --value={{ item.value}}
diff --git a/roles/cobbler/tasks/upload_templates.yml b/roles/cobbler/tasks/upload_templates.yml
index 1c5a82c..97ceb4c 100644
--- a/roles/cobbler/tasks/upload_templates.yml
+++ b/roles/cobbler/tasks/upload_templates.yml
@@ -9,17 +9,6 @@
   tags:
     - httpd
 
-- name: Upload items in /etc/cobbler
-  template:
-    src: "etc/{{ item }}"
-    dest: "/etc/cobbler/{{ item }}"
-    owner: root
-    group: root
-    mode: 0644
-  with_items: etc_cobbler_files
-  tags:
-    - etc
-
 - name: Upload kickstarts and preseeds.
   template:
     src: "kickstarts/{{ item }}"
diff --git a/roles/cobbler/templates/etc/users.digest b/roles/cobbler/templates/etc/users.digest
deleted file mode 100644
index 7765a9d..0000000
--- a/roles/cobbler/templates/etc/users.digest
+++ /dev/null
@@ -1,2 +0,0 @@
-## {{ ansible_managed }}
-cobbler:Cobbler:a4fa62c1597fca6d8cf27b1325b0ae6a