Merge "tftp service name can vary"

This commit is contained in:
Jenkins 2016-02-29 13:02:37 +00:00 committed by Gerrit Code Review
commit e1fddee346
3 changed files with 4 additions and 2 deletions

View File

@ -9,6 +9,7 @@ sgabios_dir: /usr/share/qemu/
nginx_user: www-data
virt_group: libvirtd
mysql_service_name: mysql
tftp_service_name: tftpd-hpa
required_packages:
- mysql-server
- rabbitmq-server

View File

@ -9,6 +9,7 @@ sgabios_dir: /usr/share/sgabios/
nginx_user: nginx
virt_group: libvirt
mysql_service_name: mariadb
tftp_service_name: tftp
required_packages:
- mariadb-server
- dnsmasq

View File

@ -22,8 +22,8 @@
- "{{ http_boot_folder }}/pxelinux.cfg"
- name: "Place tftpd map-file"
copy: src=tftpboot-map-file dest=/tftpboot/map-file owner=ironic group=ironic
- name: "Disable service tftpd-hpa"
service: name=tftpd-hpa state=stopped enabled=no
- name: "Disable service {{ tftp_service_name }}"
service: name="{{ tftp_service_name }}" state=stopped enabled=no
- name: "Set pxelinux.0 source (for Ubuntu >=14.10)"
set_fact:
syslinux_tftp_dir: '/usr/lib/PXELINUX'