ceph-ansible-prs: Change group for jenkins_user

Required to switch to Ubuntu 16.10.
The group `libvirtd` seems to have been renamed to `libvirt`.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

diff --git a/ansible/examples/slave_libvirt_static.yml b/ansible/examples/slave_libvirt_static.yml
index 903721592d0d3ed12fc6a8bdc95930c22ff96c6b..0b63ce16a338e6f4520f127a6c684ef5b028277e 100644 (file)
--- a/ansible/examples/slave_libvirt_static.yml
+++ b/ansible/examples/slave_libvirt_static.yml
@@ -75,10 +75,18 @@
         - default-jdk
         - default-jre
 
+    - set_fact:
+        jenkins_group: 'libvirtd'
+      when: ansible_distribution_version == '16.04'
+
+    - set_fact:
+        jenkins_group: 'libvirt'
+      when: ansible_distribution_version == '16.10'
+
     - name: "create a {{ jenkins_user }} user"
       user:
         name: "{{ jenkins_user }}"
-        groups: libvirtd
+        groups: "{{ jenkins_group }}"
         append: yes
         comment: "Jenkins Build Slave User"
 

diff --git a/ansible/slave_libvirt.yml b/ansible/slave_libvirt.yml
index 4b8745c0886d8af553bed26e46cc7326fb0fa5a4..64f12e0ecc1ca2c4fcd4e34f33dc466bc2d8e053 100644 (file)
--- a/ansible/slave_libvirt.yml
+++ b/ansible/slave_libvirt.yml
@@ -48,10 +48,18 @@
         - vagrant
       when: ansible_pkg_mgr  == "apt"
 
+    - set_fact:
+        jenkins_group: 'libvirtd'
+      when: ansible_distribution_version == '16.04'
+
+    - set_fact:
+        jenkins_group: 'libvirt'
+      when: ansible_distribution_version == '16.10'
+
     - name: create a {{ jenkins_user }} user
       user:
         name: "{{ jenkins_user }}"
-        groups: libvirtd
+        groups: "{{ jenkins_group }}"
         append: yes
         comment: "Jenkins Build Slave User"