openstack/bifrost
Code Issues Proposed changes

Merge "Getting libvirt functional for testing on RedHat/CentOS"

Browse Source
This commit is contained in:
Jenkins 2015-07-02 03:50:05 +00:00 committed by Gerrit Code Review
commit 7aa271b782
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
playbooks/roles/ironic-install/defaults/required_defaults_Debian.yml
View File

@ -6,6 +6,7 @@ syslinux_tftp_dir: /usr/lib/syslinux/
ipxe_dir: /usr/lib/ipxe/ ipxe_dir: /usr/lib/ipxe/
sgabios_dir: /usr/share/qemu/ sgabios_dir: /usr/share/qemu/
nginx_user: www-data nginx_user: www-data
virt_group: libvirtd
mysql_service_name: mysql mysql_service_name: mysql
required_packages: required_packages:
- mysql-server - mysql-server

1
playbooks/roles/ironic-install/defaults/required_defaults_RedHat.yml
View File

@ -6,6 +6,7 @@ syslinux_tftp_dir: /var/lib/tftpboot
ipxe_dir: /usr/share/ipxe/ ipxe_dir: /usr/share/ipxe/
sgabios_dir: /usr/share/sgabios/ sgabios_dir: /usr/share/sgabios/
nginx_user: nginx nginx_user: nginx
virt_group: libvirt
mysql_service_name: mariadb mysql_service_name: mariadb
required_packages: required_packages:
- mariadb-server - mariadb-server

18
playbooks/roles/ironic-install/tasks/main.yml
View File

@ -99,8 +99,22 @@
group: name=ironic group: name=ironic
- name: "Creating an ironic service user" - name: "Creating an ironic service user"
user: name=ironic group=ironic user: name=ironic group=ironic
- name: "Adding ironic user to libvirtd group" - name: "Create libvirt group on RedHat/Centos"
user: name=ironic group=libvirtd append=yes group: name=libvirt
when: ansible_os_family == 'RedHat'
# NOTE(TheJulia): Modify the supplied libvirtd config as by default,
# access to libvirt is restricted to the root group via polkit.
- name: "Update libvirt configuration file on RedHat/CentOS so the user"
lineinfile: dest=/etc/libvirt/libvirtd.conf regexp=^unix_sock_group line='unix_sock_group = "libvirt"'
when: ansible_os_family == 'RedHat'
- name: "Changing libvirt authentication to none as RedHat/CentOS use polkit by default"
lineinfile: dest=/etc/libvirt/libvirtd.conf regexp=^auth_unix_rw line='auth_unix_rw = "none"'
when: ansible_os_family == 'RedHat'
- name: "Changing libvirt socket permissions to be restricted on on RedHat/CentOS"
lineinfile: dest=/etc/libvirt/libvirtd.conf regexp=^unix_sock_rw_perms line=unix_sock_rw_perms="0770"
when: ansible_os_family == 'RedHat'
- name: "Adding ironic user to virtualization group"
user: name=ironic group="{{ virt_group }}" append=yes
when: testing == true when: testing == true
- name: "Creating SSH directory for ironic user" - name: "Creating SSH directory for ironic user"
local_action: file path=/home/ironic/.ssh owner=ironic group=ironic mode=0700 state=directory local_action: file path=/home/ironic/.ssh owner=ironic group=ironic mode=0700 state=directory