openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Set tftp to only listen to the provisioning network"

Browse Source
This commit is contained in:
Zuul 2018-01-10 07:15:19 +00:00 committed by Gerrit Code Review
commit d03199743f
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/services/ironic-pxe.yaml
View File

@ -64,7 +64,6 @@ outputs:
merge: true merge: true
preserve_properties: true preserve_properties: true
/var/lib/kolla/config_files/ironic_pxe_tftp.json: /var/lib/kolla/config_files/ironic_pxe_tftp.json:
command: /usr/sbin/in.tftpd --foreground --user root --address 0.0.0.0:69 --map-file /var/lib/ironic/tftpboot/map-file /var/lib/ironic/tftpboot
config_files: config_files:
- source: "/var/lib/kolla/config_files/src/*" - source: "/var/lib/kolla/config_files/src/*"
dest: "/" dest: "/"
@ -79,6 +78,7 @@ outputs:
ironic_pxe_tftp: ironic_pxe_tftp:
start_order: 90 start_order: 90
image: &ironic_pxe_image {get_param: DockerIronicPxeImage} image: &ironic_pxe_image {get_param: DockerIronicPxeImage}
command: ['/bin/bash', '-c', 'BIND_HOST=$(hiera ironic::pxe::tftp_bind_host -c /etc/puppet/hiera.yaml); /usr/sbin/in.tftpd --foreground --user root --address $BIND_HOST:69 --map-file /var/lib/ironic/tftpboot/map-file /var/lib/ironic/tftpboot']
net: host net: host
privileged: false privileged: false
restart: always restart: always

1
puppet/services/ironic-conductor.yaml
View File

@ -191,6 +191,7 @@ outputs:
# internal_api_uri -> [IP] # internal_api_uri -> [IP]
# internal_api_subnet - > IP/CIDR # internal_api_subnet - > IP/CIDR
ironic::drivers::pxe::tftp_server: {get_param: [ServiceNetMap, IronicNetwork]} ironic::drivers::pxe::tftp_server: {get_param: [ServiceNetMap, IronicNetwork]}
ironic::pxe::tftp_bind_host: {get_param: [ServiceNetMap, IronicNetwork]}
# NOTE(dtantsur): UEFI only works with iPXE currently for us # NOTE(dtantsur): UEFI only works with iPXE currently for us
ironic::drivers::pxe::uefi_pxe_config_template: '$pybasedir/drivers/modules/ipxe_config.template' ironic::drivers::pxe::uefi_pxe_config_template: '$pybasedir/drivers/modules/ipxe_config.template'
ironic::drivers::pxe::uefi_pxe_bootfile_name: 'ipxe.efi' ironic::drivers::pxe::uefi_pxe_bootfile_name: 'ipxe.efi'