Per service configuration

Since it is possible to run both nodepool and nodepool-builder, we
should give the user 2 different configuration files.

Change-Id: I9e825a331d04124a2548203cfd8d77935fdf7bb6
Signed-off-by: Paul Belanger <pabelanger@redhat.com>

defaults/main.yaml

@@ -74,6 +74,9 @@ nodepool_file_nodepool_service_config_owner: root
 nodepool_file_nodepool_builder_service_group: root
 nodepool_file_nodepool_builder_service_owner: root
 
+nodepool_file_nodepool_builder_service_config_group: root
+nodepool_file_nodepool_builder_service_config_owner: root
+
 nodepool_service_nodepool_enabled: yes
 nodepool_service_nodepool_manage: true
 nodepool_service_nodepool_name: nodepool

files/etc/default/nodepool

@@ -1 +1,5 @@
+# This file is generated by Ansible
+#  DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
+#
+
 DIB_IMAGE_CACHE=/opt/nodepool/cache

files/etc/default/nodepool-builder

@@ -0,0 +1,5 @@
+# This file is generated by Ansible
+#  DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
+#
+
+DIB_IMAGE_CACHE=/opt/nodepool/cache

files/etc/sysconfig/nodepool

@@ -1 +1,5 @@
+# This file is generated by Ansible
+#  DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
+#
+
 DIB_IMAGE_CACHE=/opt/nodepool/cache

files/etc/sysconfig/nodepool-builder

@@ -0,0 +1,5 @@
+# This file is generated by Ansible
+#  DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
+#
+
+DIB_IMAGE_CACHE=/opt/nodepool/cache

files/etc/systemd/system/nodepool-builder.service

@@ -6,7 +6,7 @@ After=syslog.target network.target
 Type=simple
 User=nodepool
 Group=nodepool
-EnvironmentFile=-/etc/sysconfig/nodepool
+EnvironmentFile=-/etc/sysconfig/nodepool-builder
 ExecStart=/usr/bin/nodepool-builder -d -l /etc/nodepool/logging.conf
 
 [Install]

tasks/service.yaml

@@ -12,21 +12,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 ---
-- name: Define nodepool_file_nodepool_service_config_dest.
-  set_fact:
-    nodepool_file_nodepool_service_config_dest: "{{ __nodepool_file_nodepool_service_config_dest  }}"
-  when: nodepool_file_nodepool_service_config_dest is not defined
-
-- name: Define nodepool_file_nodepool_service_config_mode.
-  set_fact:
-    nodepool_file_nodepool_service_config_mode: "{{ __nodepool_file_nodepool_service_config_mode  }}"
-  when: nodepool_file_nodepool_service_config_mode is not defined
-
-- name: Define nodepool_file_nodepool_service_config_src.
-  set_fact:
-    nodepool_file_nodepool_service_config_src: "{{ __nodepool_file_nodepool_service_config_src  }}"
-  when: nodepool_file_nodepool_service_config_src is not defined
-
 - name: Define nodepool_file_nodepool_service_dest.
   set_fact:
     nodepool_file_nodepool_service_dest: "{{ __nodepool_file_nodepool_service_dest }}"
@@ -42,6 +27,21 @@
     nodepool_file_nodepool_service_src: "{{ __nodepool_file_nodepool_service_src }}"
   when: nodepool_file_nodepool_service_src is not defined
 
+- name: Define nodepool_file_nodepool_service_config_dest.
+  set_fact:
+    nodepool_file_nodepool_service_config_dest: "{{ __nodepool_file_nodepool_service_config_dest  }}"
+  when: nodepool_file_nodepool_service_config_dest is not defined
+
+- name: Define nodepool_file_nodepool_service_config_mode.
+  set_fact:
+    nodepool_file_nodepool_service_config_mode: "{{ __nodepool_file_nodepool_service_config_mode  }}"
+  when: nodepool_file_nodepool_service_config_mode is not defined
+
+- name: Define nodepool_file_nodepool_service_config_src.
+  set_fact:
+    nodepool_file_nodepool_service_config_src: "{{ __nodepool_file_nodepool_service_config_src  }}"
+  when: nodepool_file_nodepool_service_config_src is not defined
+
 - name: Define nodepool_file_nodepool_builder_service_dest.
   set_fact:
     nodepool_file_nodepool_builder_service_dest: "{{ __nodepool_file_nodepool_builder_service_dest }}"
@@ -57,13 +57,20 @@
     nodepool_file_nodepool_builder_service_src: "{{ __nodepool_file_nodepool_builder_service_src }}"
   when: nodepool_file_nodepool_builder_service_src is not defined
 
-- name: Copy nodepool service config into place.
-  copy:
-    dest: "{{ nodepool_file_nodepool_service_config_dest  }}"
-    group: "{{ nodepool_file_nodepool_service_config_group  }}"
-    mode: "{{ nodepool_file_nodepool_service_config_mode  }}"
-    owner: "{{ nodepool_file_nodepool_service_config_owner  }}"
-    src: "{{ nodepool_file_nodepool_service_config_src  }}"
+- name: Define nodepool_file_nodepool_builder_service_config_dest.
+  set_fact:
+    nodepool_file_nodepool_builder_service_config_dest: "{{ __nodepool_file_nodepool_builder_service_config_dest  }}"
+  when: nodepool_file_nodepool_builder_service_config_dest is not defined
+
+- name: Define nodepool_file_nodepool_builder_service_config_mode.
+  set_fact:
+    nodepool_file_nodepool_builder_service_config_mode: "{{ __nodepool_file_nodepool_builder_service_config_mode  }}"
+  when: nodepool_file_nodepool_builder_service_config_mode is not defined
+
+- name: Define nodepool_file_nodepool_builder_service_config_src.
+  set_fact:
+    nodepool_file_nodepool_builder_service_config_src: "{{ __nodepool_file_nodepool_builder_service_config_src  }}"
+  when: nodepool_file_nodepool_builder_service_config_src is not defined
 
 - name: Copy nodepool services scripts into place.
   copy:
@@ -73,6 +80,14 @@
     owner: "{{ nodepool_file_nodepool_service_owner }}"
     src: "{{ nodepool_file_nodepool_service_src }}"
 
+- name: Copy nodepool service config into place.
+  copy:
+    dest: "{{ nodepool_file_nodepool_service_config_dest  }}"
+    group: "{{ nodepool_file_nodepool_service_config_group  }}"
+    mode: "{{ nodepool_file_nodepool_service_config_mode  }}"
+    owner: "{{ nodepool_file_nodepool_service_config_owner  }}"
+    src: "{{ nodepool_file_nodepool_service_config_src  }}"
+
 - name: Copy nodepool-builder services scripts into place.
   copy:
     dest: "{{ nodepool_file_nodepool_builder_service_dest }}"
@@ -81,6 +96,14 @@
     owner: "{{ nodepool_file_nodepool_builder_service_owner }}"
     src: "{{ nodepool_file_nodepool_builder_service_src }}"
 
+- name: Copy nodepool service config into place.
+  copy:
+    dest: "{{ nodepool_file_nodepool_builder_service_config_dest  }}"
+    group: "{{ nodepool_file_nodepool_builder_service_config_group  }}"
+    mode: "{{ nodepool_file_nodepool_builder_service_config_mode  }}"
+    owner: "{{ nodepool_file_nodepool_builder_service_config_owner  }}"
+    src: "{{ nodepool_file_nodepool_builder_service_config_src  }}"
+
 - name: Enable nodepool service.
   service:
     enabled: "{{ nodepool_service_nodepool_enabled }}"

tests/test.yaml

@@ -179,6 +179,38 @@
       shell: /usr/sbin/service nodepool status
       tags: skip_ansible_lint
 
+    - name: Register /etc/default/nodepool
+      stat:
+        path: /etc/default/nodepool
+      register: debian_nodepool_builder_sysconfig_stat
+      when: ansible_os_family == 'Debian'
+
+    - name: Assert debian_nodepool_builder_sysconfig_stat tests.
+      assert:
+        that:
+          - debian_nodepool_builder_sysconfig_stat.stat.exists
+          - debian_nodepool_builder_sysconfig_stat.stat.isreg
+          - debian_nodepool_builder_sysconfig_stat.stat.pw_name == 'root'
+          - debian_nodepool_builder_sysconfig_stat.stat.gr_name == 'root'
+          - debian_nodepool_builder_sysconfig_stat.stat.mode == '0644'
+      when: ansible_os_family == 'Debian'
+
+    - name: Register /etc/sysconfig/nodepool-builder
+      stat:
+        path: /etc/sysconfig/nodepool-builder
+      register: redhat_nodepool_builder_sysconfig_stat
+      when: ansible_os_family == 'RedHat'
+
+    - name: Assert redhat_nodepool_builder_sysconfig_stat tests.
+      assert:
+        that:
+          - redhat_nodepool_builder_sysconfig_stat.stat.exists
+          - redhat_nodepool_builder_sysconfig_stat.stat.isreg
+          - redhat_nodepool_builder_sysconfig_stat.stat.pw_name == 'root'
+          - redhat_nodepool_builder_sysconfig_stat.stat.gr_name == 'root'
+          - redhat_nodepool_builder_sysconfig_stat.stat.mode == '0644'
+      when: ansible_os_family == 'RedHat'
+
     - name: Register /etc/init.d/nodepool-builder
       stat:
         path: /etc/init.d/nodepool-builder

vars/Debian.yaml

@@ -33,14 +33,18 @@ __nodepool_build_depends:
   - python-pip
   - zlib1g-dev
 
-__nodepool_file_nodepool_service_config_dest: /etc/default/nodepool
-__nodepool_file_nodepool_service_config_mode: "0644"
-__nodepool_file_nodepool_service_config_src: etc/default/nodepool
-
 __nodepool_file_nodepool_service_dest: /etc/init.d/nodepool
 __nodepool_file_nodepool_service_mode: "0755"
 __nodepool_file_nodepool_service_src: etc/init.d/nodepool
 
+__nodepool_file_nodepool_service_config_dest: /etc/default/nodepool
+__nodepool_file_nodepool_service_config_mode: "0644"
+__nodepool_file_nodepool_service_config_src: etc/default/nodepool
+
 __nodepool_file_nodepool_builder_service_dest: /etc/init.d/nodepool-builder
 __nodepool_file_nodepool_builder_service_mode: "0755"
 __nodepool_file_nodepool_builder_service_src: etc/init.d/nodepool-builder
+
+__nodepool_file_nodepool_builder_service_config_dest: /etc/default/nodepool-builder
+__nodepool_file_nodepool_builder_service_config_mode: "0644"
+__nodepool_file_nodepool_builder_service_config_src: etc/default/nodepool-builder

vars/RedHat.yaml

@@ -24,14 +24,18 @@ __nodepool_build_depends:
   - python-pip
   - zlib-devel
 
-__nodepool_file_nodepool_service_config_dest: /etc/sysconfig/nodepool
-__nodepool_file_nodepool_service_config_mode: "0644"
-__nodepool_file_nodepool_service_config_src: etc/sysconfig/nodepool
-
 __nodepool_file_nodepool_service_dest: /etc/systemd/system/nodepool.service
 __nodepool_file_nodepool_service_mode: "0644"
 __nodepool_file_nodepool_service_src: etc/systemd/system/nodepool.service
 
+__nodepool_file_nodepool_service_config_dest: /etc/sysconfig/nodepool
+__nodepool_file_nodepool_service_config_mode: "0644"
+__nodepool_file_nodepool_service_config_src: etc/sysconfig/nodepool
+
 __nodepool_file_nodepool_builder_service_dest: /etc/systemd/system/nodepool-builder.service
 __nodepool_file_nodepool_builder_service_mode: "0644"
 __nodepool_file_nodepool_builder_service_src: etc/systemd/system/nodepool-builder.service
+
+__nodepool_file_nodepool_builder_service_config_dest: /etc/sysconfig/nodepool-builder
+__nodepool_file_nodepool_builder_service_config_mode: "0644"
+__nodepool_file_nodepool_builder_service_config_src: etc/sysconfig/nodepool-builder