openstack/bifrost
Code Issues Proposed changes

Merge "Make path to ironic-rootwrap dynamic"

Browse Source
This commit is contained in:
Jenkins 2017-01-31 14:24:01 +00:00 committed by Gerrit Code Review
commit fa257d6e7b
4 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,6 +6,7 @@ syslinux_tftp_dir: /usr/lib/syslinux/
ipxe_dir: /usr/lib/ipxe/
ipxe_full_binary: ipxe.pxe
sgabios_dir: /usr/share/qemu/
ironic_rootwrap_dir: /usr/local/bin/
nginx_user: www-data
virt_group: libvirtd
mysql_service_name: mysql

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

@ -6,6 +6,7 @@ syslinux_tftp_dir: /var/lib/tftpboot
ipxe_dir: /usr/share/ipxe/
ipxe_full_binary: ipxe.lkrn
sgabios_dir: /usr/share/sgabios/
ironic_rootwrap_dir: /usr/bin/
nginx_user: nginx
virt_group: libvirt
mysql_service_name: mariadb

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

@ -11,6 +11,7 @@ download_ipxe: true
ipxe_dir: /usr/local/share/ipxe
ipxe_full_binary: ipxe.lkrn
sgabios_dir: /usr/share/sgabios/
ironic_rootwrap_dir: /usr/bin/
nginx_user: nginx
virt_group: libvirt
mysql_service_name: mysql

2
playbooks/roles/bifrost-ironic-install/tasks/ironic_config.yml
View File

@ -28,5 +28,5 @@
lineinfile:
dest: /etc/sudoers
regexp: '^ironic(.*)/etc/ironic/rootwrap.conf(.*)'
line: "ironic ALL = (root) NOPASSWD: /usr/local/bin/ironic-rootwrap /etc/ironic/rootwrap.conf *"
line: "ironic ALL = (root) NOPASSWD: {{ ironic_rootwrap_dir }}/ironic-rootwrap /etc/ironic/rootwrap.conf *"
when: enable_pxe_drivers | bool == true