Fix genconfig for ironic-dnsmasq for kolla-kubernetes

Fix genconfig for ironic-dnsmasq for kolla-kubernetes

Change-Id: Icdf6f0aabb2b587437238e52305b06f424044546
Closes-Bug: #1665343

ansible/roles/ironic/tasks/config.yml

@@ -78,6 +78,7 @@
   with_items:
     - "ironic-agent.kernel"
     - "ironic-agent.initramfs"
+  when: orchestration_engine != 'KUBERNETES'
 
 - name: Check if policies shall be overwritten
   local_action: stat path="{{ node_custom_config }}/ironic/policy.json"

ansible/roles/ironic/templates/ironic-dnsmasq.conf.j2

 port=0
+{% if orchestration_engine != 'KUBERNETES' %}
 interface={{ api_interface }}
-bind-interfaces
 dhcp-range={{ ironic_dnsmasq_dhcp_range }}
-dhcp-sequential-ip
-
 dhcp-option=option:tftp-server,{{ kolla_internal_vip_address }}
 dhcp-option=option:server-ip-address,{{ kolla_internal_vip_address }}
+{% else %}
+interface=undefined
+dhcp-range=
+dhcp-option=option:tftp-server,undefined
+dhcp-option=option:server-ip-address,undefined
+{% endif %}
+bind-interfaces
+dhcp-sequential-ip
 dhcp-option=option:bootfile-name,pxelinux.0
 dhcp-option=210,/tftpboot/

ansible/roles/ironic/templates/ironic-pxe.json.j2

 {
     "command": "/usr/sbin/in.tftpd --verbose --foreground --user root --address 0.0.0.0:69 --map-file /map-file /tftpboot",
     "config_files": [
+{% if orchestration_engine != 'KUBERNETES' %}
         {
             "source": "{{ container_config_directory }}/ironic-agent.kernel",
             "dest": "/tftpboot/ironic-agent.kernel",
@@ -13,6 +14,7 @@
             "owner": "root",
             "perm": "0644"
         },
+{% endif %}
         {
             "source": "{{ container_config_directory }}/default",
             "dest": "/tftpboot/pxelinux.cfg/default",

ansible/roles/ironic/templates/pxelinux.default.j2

@@ -2,6 +2,10 @@ default introspect
 
 label introspect
 kernel ironic-agent.kernel
+{% if orchestration_engine != 'KUBERNETES' %}
 append initrd=ironic-agent.initramfs ipa-inspection-callback-url=http://{{ kolla_internal_vip_address }}:{{ ironic_inspector_port }}/v1/continue systemd.journald.forward_to_console=yes
+{% else %}
+append initrd=ironic-agent.initramfs ipa-inspection-callback-url=http://ironic-inspector:{{ ironic_inspector_port }}/v1/continue systemd.journald.forward_to_console=yes
+{% endif %}
 
 ipappend 3