Merge latest changes from upstream

Dockerfile

@@ -12,6 +12,10 @@ RUN yum install -y python-requests && \
 RUN mkdir /tftpboot && \
     cp /usr/share/ipxe/undionly.kpxe /usr/share/ipxe/ipxe.efi /tftpboot/
 
+COPY ./ironic.conf /tmp/ironic.conf
+RUN crudini --merge /etc/ironic/ironic.conf < /tmp/ironic.conf && \
+    rm /tmp/ironic.conf
+
 COPY ./runironic-api.sh /bin/runironic-api
 COPY ./runironic-conductor.sh /bin/runironic-conductor
 COPY ./runironic-exporter.sh /bin/runironic-exporter

configure-ironic.sh

@@ -10,46 +10,25 @@ NUMWORKERS=$(( NUMPROC < 12 ? NUMPROC : 12 ))
 
 cp /etc/ironic/ironic.conf /etc/ironic/ironic.conf_orig
 
-crudini --set /etc/ironic/ironic.conf DEFAULT auth_strategy noauth
-crudini --set /etc/ironic/ironic.conf DEFAULT my_ip "$IRONIC_IP"
-crudini --set /etc/ironic/ironic.conf DEFAULT debug true
-crudini --set /etc/ironic/ironic.conf DEFAULT default_network_interface noop
-crudini --set /etc/ironic/ironic.conf DEFAULT enabled_boot_interfaces pxe,ipxe,fake
-crudini --set /etc/ironic/ironic.conf DEFAULT enabled_power_interfaces ipmitool,idrac,fake
-crudini --set /etc/ironic/ironic.conf DEFAULT enabled_management_interfaces ipmitool,idrac,fake
-crudini --set /etc/ironic/ironic.conf DEFAULT enabled_hardware_types ipmi,idrac,fake-hardware
-crudini --set /etc/ironic/ironic.conf DEFAULT enabled_vendor_interfaces ipmitool,no-vendor,idrac,fake
-crudini --set /etc/ironic/ironic.conf DEFAULT enabled_deploy_interfaces direct,fake
-crudini --set /etc/ironic/ironic.conf DEFAULT default_boot_interface ipxe
-crudini --set /etc/ironic/ironic.conf DEFAULT default_deploy_interface direct
-crudini --set /etc/ironic/ironic.conf DEFAULT enabled_inspect_interfaces inspector,idrac,fake
-crudini --set /etc/ironic/ironic.conf DEFAULT default_inspect_interface inspector
-crudini --set /etc/ironic/ironic.conf DEFAULT rpc_transport json-rpc
-crudini --set /etc/ironic/ironic.conf conductor enable_mdns True
-crudini --set /etc/ironic/ironic.conf conductor send_sensor_data true
-crudini --set /etc/ironic/ironic.conf oslo_messaging_notifications driver prometheus_exporter
-crudini --set /etc/ironic/ironic.conf oslo_messaging_notifications transport_url fake://
-crudini --set /etc/ironic/ironic.conf oslo_messaging_notifications location /shared/ironic_prometheus_exporter
-crudini --set /etc/ironic/ironic.conf dhcp dhcp_provider none
-crudini --set /etc/ironic/ironic.conf conductor automated_clean true
-crudini --set /etc/ironic/ironic.conf conductor api_url http://${IRONIC_IP}:6385
-crudini --set /etc/ironic/ironic.conf database connection mysql+pymysql://ironic:${MARIADB_PASSWORD}@localhost/ironic?charset=utf8
-crudini --set /etc/ironic/ironic.conf deploy http_url http://${IRONIC_IP}:${HTTP_PORT}
-crudini --set /etc/ironic/ironic.conf deploy http_root /shared/html/
-crudini --set /etc/ironic/ironic.conf deploy default_boot_option local
-crudini --set /etc/ironic/ironic.conf deploy erase_devices_priority 0
-crudini --set /etc/ironic/ironic.conf deploy erase_devices_metadata_priority 10
-crudini --set /etc/ironic/ironic.conf inspector endpoint_override http://${IRONIC_IP}:5050
-crudini --set /etc/ironic/ironic.conf pxe ipxe_enabled true
-crudini --set /etc/ironic/ironic.conf pxe tftp_root /shared/tftpboot
-crudini --set /etc/ironic/ironic.conf pxe tftp_master_path /shared/tftpboot
-crudini --set /etc/ironic/ironic.conf pxe instance_master_path /shared/html/master_images
-crudini --set /etc/ironic/ironic.conf pxe images_path /shared/html/tmp
-crudini --set /etc/ironic/ironic.conf pxe pxe_config_template \$pybasedir/drivers/modules/ipxe_config.template
-crudini --set /etc/ironic/ironic.conf pxe uefi_pxe_config_template \$pybasedir/drivers/modules/ipxe_config.template
-crudini --set /etc/ironic/ironic.conf agent deploy_logs_collect always
-crudini --set /etc/ironic/ironic.conf agent deploy_logs_local_path /shared/log/ironic/deploy
-crudini --set /etc/ironic/ironic.conf api api_workers "$NUMWORKERS"
+crudini --merge /etc/ironic/ironic.conf <<EOF
+[DEFAULT]
+my_ip = $IRONIC_IP
+
+[api]
+api_workers = $NUMWORKERS
+
+[conductor]
+api_url = http://${IRONIC_IP}:6385
+
+[database]
+connection = mysql+pymysql://ironic:${MARIADB_PASSWORD}@localhost/ironic?charset=utf8
+
+[deploy]
+http_url = http://${IRONIC_IP}:${HTTP_PORT}
+
+[inspector]
+endpoint_override = http://${IRONIC_IP}:5050
+EOF
 
 mkdir -p /shared/html
 mkdir -p /shared/ironic_prometheus_exporter

ironic.conf

@@ -0,0 +1,48 @@
+[DEFAULT]
+auth_strategy = noauth
+debug = true
+default_boot_interface = ipxe
+default_deploy_interface = direct
+default_inspect_interface = inspector
+default_network_interface = noop
+enabled_boot_interfaces = pxe,ipxe,fake
+enabled_deploy_interfaces = direct,fake
+enabled_hardware_types = ipmi,idrac,fake-hardware
+enabled_inspect_interfaces = inspector,idrac,fake
+enabled_management_interfaces = ipmitool,idrac,fake
+enabled_power_interfaces = ipmitool,idrac,fake
+enabled_vendor_interfaces = ipmitool,no-vendor,idrac,fake
+rpc_transport = json-rpc
+use_stderr = true
+
+[agent]
+deploy_logs_collect = always
+deploy_logs_local_path = /shared/log/ironic/deploy
+
+[conductor]
+automated_clean = true
+enable_mdns = True
+send_sensor_data = true
+
+[deploy]
+default_boot_option = local
+erase_devices_metadata_priority = 10
+erase_devices_priority = 0
+http_root = /shared/html/
+
+[dhcp]
+dhcp_provider = none
+
+[oslo_messaging_notifications]
+driver = prometheus_exporter
+location = /shared/ironic_prometheus_exporter
+transport_url = fake://
+
+[pxe]
+images_path = /shared/html/tmp
+instance_master_path = /shared/html/master_images
+ipxe_enabled = true
+pxe_config_template = $pybasedir/drivers/modules/ipxe_config.template
+tftp_master_path = /shared/tftpboot
+tftp_root = /shared/tftpboot
+uefi_pxe_config_template = $pybasedir/drivers/modules/ipxe_config.template

runironic-api.sh

@@ -7,7 +7,5 @@ if ! iptables -C INPUT -i "$PROVISIONING_INTERFACE" -p tcp -m tcp --dport 6385 -
     iptables -I INPUT -i "$PROVISIONING_INTERFACE" -p tcp -m tcp --dport 6385 -j ACCEPT
 fi
 
-ironic-dbsync --config-file /etc/ironic/ironic.conf upgrade
-
 exec /usr/bin/ironic-api --config-file /etc/ironic/ironic.conf \
     --log-file /shared/log/ironic/ironic-api.log