openstack/bifrost
Code Issues Proposed changes

tftp service name can vary

Browse Source 
In testing on Centos 7, I found that the service name
for tftpd was tftp. On Ubuntu and Debian it's
tftpd-hpa. Specify correct defaults and modify the
task where we disable the service to run it under
xinetd.

Change-Id: I6d3328fb80dcc3178d62a840dbc3a39461b42f2a
This commit is contained in:
stephane 2016-02-23 16:12:47 -08:00
parent d9c93c669c
commit a28cec21f7
3 changed files with 4 additions and 2 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

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

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

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

4
playbooks/roles/bifrost-ironic-install/tasks/create_tftpboot.yml
View File

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