diff --git a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Debian_family.yml b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Debian_family.yml index 5e356ce5f..dff3ba29e 100644 --- a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Debian_family.yml +++ b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Debian_family.yml @@ -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 diff --git a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_RedHat_family.yml b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_RedHat_family.yml index 3c87f960d..81ebde3d2 100644 --- a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_RedHat_family.yml +++ b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_RedHat_family.yml @@ -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 diff --git a/playbooks/roles/bifrost-ironic-install/tasks/create_tftpboot.yml b/playbooks/roles/bifrost-ironic-install/tasks/create_tftpboot.yml index 8ec4c74f6..97348be9f 100644 --- a/playbooks/roles/bifrost-ironic-install/tasks/create_tftpboot.yml +++ b/playbooks/roles/bifrost-ironic-install/tasks/create_tftpboot.yml @@ -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'