From 3e0537e50736fce5b17dd76adfe51b0fffc8f51a Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Wed, 26 Jul 2017 14:47:10 +0200 Subject: [PATCH] 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 --- ansible/examples/slave_libvirt_static.yml | 10 +++++++++- ansible/slave_libvirt.yml | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/ansible/examples/slave_libvirt_static.yml b/ansible/examples/slave_libvirt_static.yml index 90372159..0b63ce16 100644 --- 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 4b8745c0..64f12e0e 100644 --- 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" -- 2.39.5