Support systemd for ubuntu-xenial too

Here we are adding support to our existing systemd files for both
centos-7 and ubuntu-xenial.

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

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

@@ -0,0 +1,13 @@
+[Unit]
+Description=Nodepool Builder Service
+After=syslog.target network.target
+
+[Service]
+Type=simple
+User=nodepool
+Group=nodepool
+EnvironmentFile=-/etc/default/nodepool-builder
+ExecStart=/bin/sh -c "${PREFIX}/bin/nodepool-builder -d ${ARGS}"
+
+[Install]
+WantedBy=multi-user.target

files/etc/systemd/system/nodepool-deleter.service.ubuntu-xenial

@@ -0,0 +1,13 @@
+[Unit]
+Description=Nodepool Deleter Service
+After=syslog.target network.target
+
+[Service]
+Type=simple
+User=nodepool
+Group=nodepool
+EnvironmentFile=-/etc/default/nodepool-deleter
+ExecStart=/bin/sh -c "${PREFIX}/bin/nodepoold -d ${ARGS}"
+
+[Install]
+WantedBy=multi-user.target

files/etc/systemd/system/nodepool-launcher.service.ubuntu-xenial

@@ -0,0 +1,13 @@
+[Unit]
+Description=Nodepool Launcher Service
+After=syslog.target network.target
+
+[Service]
+Type=simple
+User=nodepool
+Group=nodepool
+EnvironmentFile=-/etc/default/nodepool-launcher
+ExecStart=/bin/sh -c "${PREFIX}/bin/nodepoold -d ${ARGS}"
+
+[Install]
+WantedBy=multi-user.target

files/etc/systemd/system/nodepool.service.ubuntu-xenial

@@ -0,0 +1,13 @@
+[Unit]
+Description=Nodepool Service
+After=syslog.target network.target
+
+[Service]
+Type=simple
+User=nodepool
+Group=nodepool
+EnvironmentFile=-/etc/default/nodepool
+ExecStart=/bin/sh -c "${PREFIX}/bin/nodepoold -d ${ARGS}"
+
+[Install]
+WantedBy=multi-user.target

tests/test.yaml

@@ -238,34 +238,40 @@
     - name: Register /etc/init.d/nodepool
       stat:
         path: /etc/init.d/nodepool
-      register: debian_nodepool_service_stat
-      when: ansible_os_family == 'Debian'
+      register: _nodepool_service_initd_stat
+      when:
+        - ansible_distribution == 'Ubuntu'
+        - ansible_distribution_release == 'trusty'
 
-    - name: Assert debian_nodepool_service_stat tests.
+    - name: Assert _nodepool_service_initd_stat tests.
       assert:
         that:
-          - debian_nodepool_service_stat.stat.exists
-          - debian_nodepool_service_stat.stat.isreg
-          - debian_nodepool_service_stat.stat.pw_name == 'root'
-          - debian_nodepool_service_stat.stat.gr_name == 'root'
-          - debian_nodepool_service_stat.stat.mode == '0755'
-      when: ansible_os_family == 'Debian'
+          - _nodepool_service_initd_stat.stat.exists
+          - _nodepool_service_initd_stat.stat.isreg
+          - _nodepool_service_initd_stat.stat.pw_name == 'root'
+          - _nodepool_service_initd_stat.stat.gr_name == 'root'
+          - _nodepool_service_initd_stat.stat.mode == '0755'
+      when:
+        - ansible_distribution == 'Ubuntu'
+        - ansible_distribution_release == 'trusty'
 
     - name: Register /etc/systemd/system/nodepool.service
       stat:
         path: /etc/systemd/system/nodepool.service
-      register: redhat_nodepool_service_stat
-      when: ansible_os_family == 'RedHat'
+      register: _nodepool_service_systemd_stat
+      when: (ansible_os_family == 'RedHat') or
+            (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'xenial')
 
-    - name: Assert redhat_nodepool_service_stat tests.
+    - name: Assert _nodepool_service_systemd_stat tests.
       assert:
         that:
-          - redhat_nodepool_service_stat.stat.exists
-          - redhat_nodepool_service_stat.stat.isreg
-          - redhat_nodepool_service_stat.stat.pw_name == 'root'
-          - redhat_nodepool_service_stat.stat.gr_name == 'root'
-          - redhat_nodepool_service_stat.stat.mode == '0644'
-      when: ansible_os_family == 'RedHat'
+          - _nodepool_service_systemd_stat.stat.exists
+          - _nodepool_service_systemd_stat.stat.isreg
+          - _nodepool_service_systemd_stat.stat.pw_name == 'root'
+          - _nodepool_service_systemd_stat.stat.gr_name == 'root'
+          - _nodepool_service_systemd_stat.stat.mode == '0644'
+      when: (ansible_os_family == 'RedHat') or
+            (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'xenial')
 
     - name: Ensure nodepoold is running.
       become: yes
@@ -307,34 +313,40 @@
     - name: Register /etc/init.d/nodepool-builder
       stat:
         path: /etc/init.d/nodepool-builder
-      register: debian_nodepool_builder_service_stat
-      when: ansible_os_family == 'Debian'
+      register: _nodepool_builder_service_initd_stat
+      when:
+        - ansible_distribution == 'Ubuntu'
+        - ansible_distribution_release == 'trusty'
 
-    - name: Assert debian_nodepool_builder_service_stat tests.
+    - name: Assert _nodepool_builder_service_initd_stat tests.
       assert:
         that:
-          - debian_nodepool_builder_service_stat.stat.exists
-          - debian_nodepool_builder_service_stat.stat.isreg
-          - debian_nodepool_builder_service_stat.stat.pw_name == 'root'
-          - debian_nodepool_builder_service_stat.stat.gr_name == 'root'
-          - debian_nodepool_builder_service_stat.stat.mode == '0755'
-      when: ansible_os_family == 'Debian'
+          - _nodepool_builder_service_initd_stat.stat.exists
+          - _nodepool_builder_service_initd_stat.stat.isreg
+          - _nodepool_builder_service_initd_stat.stat.pw_name == 'root'
+          - _nodepool_builder_service_initd_stat.stat.gr_name == 'root'
+          - _nodepool_builder_service_initd_stat.stat.mode == '0755'
+      when:
+        - ansible_distribution == 'Ubuntu'
+        - ansible_distribution_release == 'trusty'
 
     - name: Register /etc/systemd/system/nodepool-builder.service
       stat:
         path: /etc/systemd/system/nodepool-builder.service
-      register: redhat_nodepool_builder_service_stat
-      when: ansible_os_family == 'RedHat'
+      register: _nodepool_builder_service_systemd_stat
+      when: (ansible_os_family == 'RedHat') or
+            (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'xenial')
 
-    - name: Assert redhat_nodepool_builder_service_stat tests.
+    - name: Assert _nodepool_builder_service_systemd_stat tests.
       assert:
         that:
-          - redhat_nodepool_builder_service_stat.stat.exists
-          - redhat_nodepool_builder_service_stat.stat.isreg
-          - redhat_nodepool_builder_service_stat.stat.pw_name == 'root'
-          - redhat_nodepool_builder_service_stat.stat.gr_name == 'root'
-          - redhat_nodepool_builder_service_stat.stat.mode == '0644'
-      when: ansible_os_family == 'RedHat'
+          - _nodepool_builder_service_systemd_stat.stat.exists
+          - _nodepool_builder_service_systemd_stat.stat.isreg
+          - _nodepool_builder_service_systemd_stat.stat.pw_name == 'root'
+          - _nodepool_builder_service_systemd_stat.stat.gr_name == 'root'
+          - _nodepool_builder_service_systemd_stat.stat.mode == '0644'
+      when: (ansible_os_family == 'RedHat') or
+            (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'xenial')
 
     - name: Ensure nodepool-builder is running.
       become: yes
@@ -376,34 +388,40 @@
     - name: Register /etc/init.d/nodepool-deleter
       stat:
         path: /etc/init.d/nodepool-deleter
-      register: debian_nodepool_deleter_service_stat
-      when: ansible_os_family == 'Debian'
+      register: _nodepool_deleter_service_initd_stat
+      when:
+        - ansible_distribution == 'Ubuntu'
+        - ansible_distribution_release == 'trusty'
 
-    - name: Assert debian_nodepool_deleter_service_stat tests.
+    - name: Assert _nodepool_deleter_service_initd_stat tests.
       assert:
         that:
-          - debian_nodepool_deleter_service_stat.stat.exists
-          - debian_nodepool_deleter_service_stat.stat.isreg
-          - debian_nodepool_deleter_service_stat.stat.pw_name == 'root'
-          - debian_nodepool_deleter_service_stat.stat.gr_name == 'root'
-          - debian_nodepool_deleter_service_stat.stat.mode == '0755'
-      when: ansible_os_family == 'Debian'
+          - _nodepool_deleter_service_initd_stat.stat.exists
+          - _nodepool_deleter_service_initd_stat.stat.isreg
+          - _nodepool_deleter_service_initd_stat.stat.pw_name == 'root'
+          - _nodepool_deleter_service_initd_stat.stat.gr_name == 'root'
+          - _nodepool_deleter_service_initd_stat.stat.mode == '0755'
+      when:
+        - ansible_distribution == 'Ubuntu'
+        - ansible_distribution_release == 'trusty'
 
     - name: Register /etc/systemd/system/nodepool-deleter.service
       stat:
         path: /etc/systemd/system/nodepool-deleter.service
-      register: redhat_nodepool_deleter_service_stat
-      when: ansible_os_family == 'RedHat'
+      register: _nodepool_deleter_service_systemd_stat
+      when: (ansible_os_family == 'RedHat') or
+            (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'xenial')
 
-    - name: Assert redhat_nodepool_deleter_service_stat tests.
+    - name: Assert _nodepool_deleter_service_systemd_stat tests.
       assert:
         that:
-          - redhat_nodepool_deleter_service_stat.stat.exists
-          - redhat_nodepool_deleter_service_stat.stat.isreg
-          - redhat_nodepool_deleter_service_stat.stat.pw_name == 'root'
-          - redhat_nodepool_deleter_service_stat.stat.gr_name == 'root'
-          - redhat_nodepool_deleter_service_stat.stat.mode == '0644'
-      when: ansible_os_family == 'RedHat'
+          - _nodepool_deleter_service_systemd_stat.stat.exists
+          - _nodepool_deleter_service_systemd_stat.stat.isreg
+          - _nodepool_deleter_service_systemd_stat.stat.pw_name == 'root'
+          - _nodepool_deleter_service_systemd_stat.stat.gr_name == 'root'
+          - _nodepool_deleter_service_systemd_stat.stat.mode == '0644'
+      when: (ansible_os_family == 'RedHat') or
+            (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'xenial')
 
     - name: Ensure nodepool-deleter is running.
       become: yes
@@ -445,34 +463,40 @@
     - name: Register /etc/init.d/nodepool-launcher
       stat:
         path: /etc/init.d/nodepool-launcher
-      register: debian_nodepool_launcher_service_stat
-      when: ansible_os_family == 'Debian'
+      register: _nodepool_launcher_service_initd_stat
+      when:
+        - ansible_distribution == 'Ubuntu'
+        - ansible_distribution_release == 'trusty'
 
-    - name: Assert debian_nodepool_launcher_service_stat tests.
+    - name: Assert _nodepool_launcher_service_initd_stat tests.
       assert:
         that:
-          - debian_nodepool_launcher_service_stat.stat.exists
-          - debian_nodepool_launcher_service_stat.stat.isreg
-          - debian_nodepool_launcher_service_stat.stat.pw_name == 'root'
-          - debian_nodepool_launcher_service_stat.stat.gr_name == 'root'
-          - debian_nodepool_launcher_service_stat.stat.mode == '0755'
-      when: ansible_os_family == 'Debian'
+          - _nodepool_launcher_service_initd_stat.stat.exists
+          - _nodepool_launcher_service_initd_stat.stat.isreg
+          - _nodepool_launcher_service_initd_stat.stat.pw_name == 'root'
+          - _nodepool_launcher_service_initd_stat.stat.gr_name == 'root'
+          - _nodepool_launcher_service_initd_stat.stat.mode == '0755'
+      when:
+        - ansible_distribution == 'Ubuntu'
+        - ansible_distribution_release == 'trusty'
 
     - name: Register /etc/systemd/system/nodepool-launcher.service
       stat:
         path: /etc/systemd/system/nodepool-launcher.service
-      register: redhat_nodepool_launcher_service_stat
-      when: ansible_os_family == 'RedHat'
+      register: _nodepool_launcher_service_systemd_stat
+      when: (ansible_os_family == 'RedHat') or
+            (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'xenial')
 
-    - name: Assert redhat_nodepool_launcher_service_stat tests.
+    - name: Assert _nodepool_launcher_service_systemd_stat tests.
       assert:
         that:
-          - redhat_nodepool_launcher_service_stat.stat.exists
-          - redhat_nodepool_launcher_service_stat.stat.isreg
-          - redhat_nodepool_launcher_service_stat.stat.pw_name == 'root'
-          - redhat_nodepool_launcher_service_stat.stat.gr_name == 'root'
-          - redhat_nodepool_launcher_service_stat.stat.mode == '0644'
-      when: ansible_os_family == 'RedHat'
+          - _nodepool_launcher_service_systemd_stat.stat.exists
+          - _nodepool_launcher_service_systemd_stat.stat.isreg
+          - _nodepool_launcher_service_systemd_stat.stat.pw_name == 'root'
+          - _nodepool_launcher_service_systemd_stat.stat.gr_name == 'root'
+          - _nodepool_launcher_service_systemd_stat.stat.mode == '0644'
+      when: (ansible_os_family == 'RedHat') or
+            (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'xenial')
 
     - name: Ensure nodepool-launcher is running.
       become: yes

vars/centos-7.yaml

@@ -25,7 +25,7 @@ __nodepool_build_depends:
 
 __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_src: etc/systemd/system/nodepool.service.centos-7
 
 __nodepool_file_nodepool_service_config_dest: /etc/sysconfig/nodepool
 __nodepool_file_nodepool_service_config_mode: 0644
@@ -33,7 +33,7 @@ __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_src: etc/systemd/system/nodepool-builder.service.centos-7
 
 __nodepool_file_nodepool_builder_service_config_dest: /etc/sysconfig/nodepool-builder
 __nodepool_file_nodepool_builder_service_config_mode: 0644
@@ -41,7 +41,7 @@ __nodepool_file_nodepool_builder_service_config_src: etc/sysconfig/nodepool-buil
 
 __nodepool_file_nodepool_deleter_service_dest: /etc/systemd/system/nodepool-deleter.service
 __nodepool_file_nodepool_deleter_service_mode: 0644
-__nodepool_file_nodepool_deleter_service_src: etc/systemd/system/nodepool-deleter.service
+__nodepool_file_nodepool_deleter_service_src: etc/systemd/system/nodepool-deleter.service.centos-7
 
 __nodepool_file_nodepool_deleter_service_config_dest: /etc/sysconfig/nodepool-deleter
 __nodepool_file_nodepool_deleter_service_config_mode: 0644
@@ -49,7 +49,7 @@ __nodepool_file_nodepool_deleter_service_config_src: etc/sysconfig/nodepool-dele
 
 __nodepool_file_nodepool_launcher_service_dest: /etc/systemd/system/nodepool-launcher.service
 __nodepool_file_nodepool_launcher_service_mode: 0644
-__nodepool_file_nodepool_launcher_service_src: etc/systemd/system/nodepool-launcher.service
+__nodepool_file_nodepool_launcher_service_src: etc/systemd/system/nodepool-launcher.service.centos-7
 
 __nodepool_file_nodepool_launcher_service_config_dest: /etc/sysconfig/nodepool-launcher
 __nodepool_file_nodepool_launcher_service_config_mode: 0644

vars/ubuntu-xenial.yaml

@@ -34,33 +34,33 @@ __nodepool_build_depends:
   - python-dev
   - zlib1g-dev
 
-__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_dest: /etc/systemd/system/nodepool.service
+__nodepool_file_nodepool_service_mode: 0644
+__nodepool_file_nodepool_service_src: etc/systemd/system/nodepool.service.ubuntu-xenial
 
 __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_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.ubuntu-xenial
 
 __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
 
-__nodepool_file_nodepool_deleter_service_dest: /etc/init.d/nodepool-deleter
-__nodepool_file_nodepool_deleter_service_mode: 0755
-__nodepool_file_nodepool_deleter_service_src: etc/init.d/nodepool-deleter
+__nodepool_file_nodepool_deleter_service_dest: /etc/systemd/system/nodepool-deleter.service
+__nodepool_file_nodepool_deleter_service_mode: 0644
+__nodepool_file_nodepool_deleter_service_src: etc/systemd/system/nodepool-deleter.service.ubuntu-xenial
 
 __nodepool_file_nodepool_deleter_service_config_dest: /etc/default/nodepool-deleter
 __nodepool_file_nodepool_deleter_service_config_mode: 0644
 __nodepool_file_nodepool_deleter_service_config_src: etc/default/nodepool-deleter
 
-__nodepool_file_nodepool_launcher_service_dest: /etc/init.d/nodepool-launcher
-__nodepool_file_nodepool_launcher_service_mode: 0755
-__nodepool_file_nodepool_launcher_service_src: etc/init.d/nodepool-launcher
+__nodepool_file_nodepool_launcher_service_dest: /etc/systemd/system/nodepool-launcher.service
+__nodepool_file_nodepool_launcher_service_mode: 0644
+__nodepool_file_nodepool_launcher_service_src: etc/systemd/system/nodepool-launcher.service.ubuntu-xenial
 
 __nodepool_file_nodepool_launcher_service_config_dest: /etc/default/nodepool-launcher
 __nodepool_file_nodepool_launcher_service_config_mode: 0644