Merge "Ironic: Use generated dnsmasq conf file"

openstack-archive · Mar 12, 2022 · a799241 · a799241
2 parents df569e6 + 8813340
commit a799241
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/deployment/ironic/ironic-pxe-container-puppet.yaml b/deployment/ironic/ironic-pxe-container-puppet.yaml
@@ -61,7 +61,8 @@ outputs:
     description: Role data for the Ironic PXE role.
     value:
       service_name: ironic_pxe
-      config_settings: {}
+      config_settings:
+        ironic::pxe::tftp_use_xinetd: false
       service_config_settings: {}
       # BEGIN DOCKER SETTINGS
       puppet_config:
@@ -93,6 +94,7 @@ outputs:
               owner: ironic:ironic
               recurse: true
         /var/lib/kolla/config_files/ironic_pxe_tftp.json:
+          command: /usr/sbin/dnsmasq -k --log-facility=/var/log/ironic/dnsmasq.log --user=root --conf-file=/etc/ironic/dnsmasq-tftp-server.conf
           config_files:
             - source: "/var/lib/kolla/config_files/src/*"
               dest: "/"
@@ -140,7 +142,6 @@ outputs:
           ironic_pxe_tftp:
             start_order: 90
             image: &ironic_pxe_image {get_attr: [RoleParametersValue, value, ContainerIronicPxeImage]}
-            command: ['/bin/bash', '-c', 'BIND_HOST=$(hiera ironic::pxe::tftp_bind_host -c /etc/puppet/hiera.yaml); /usr/sbin/dnsmasq --keep-in-foreground --log-facility=/var/log/ironic/dnsmasq.log --user=root --conf-file=/dev/null --listen-address=$BIND_HOST --port=0 --enable-tftp --tftp-root=/var/lib/ironic/tftpboot']
             net: host
             cap_add:
               - NET_ADMIN