From 1ab0b7adf18c4dbb2c2800c6e1b7a33c8b63b82c Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Mon, 3 Jul 2017 15:48:07 +0100 Subject: [PATCH] Revert "Add default_boot_option configuration" This reverts commit 898155dfd294371f361f0563a2c4ee1325487507. The default value of the ironic configuration option default_boot_option will eventually change from netboot to local. The netboot option is incompatible with multitenancy in ironic, as it requires a PXE environment in the tenant network, so it was no longer deemed a suitable default value. Ironic added a warning message when this option is not explicitly set, presumably to alert operators to the change. The commit being reverted set the option to 'netboot'. This will cause operators to continue to use the netboot option even after the default value changes, which was presumably not the intention of the ironic team in changing the default value. It also hides the warning message from the operator that could alert them to the fact that this default is changing. Change-Id: I0ebb1d5ffbead50b034488337e6c93a2f48aaf69 Related-Bug: #1696636 --- ansible/roles/ironic/templates/ironic.conf.j2 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ansible/roles/ironic/templates/ironic.conf.j2 b/ansible/roles/ironic/templates/ironic.conf.j2 index db92ebd6cf..cc625b084d 100644 --- a/ansible/roles/ironic/templates/ironic.conf.j2 +++ b/ansible/roles/ironic/templates/ironic.conf.j2 @@ -1,3 +1,10 @@ +# NOTE(mgoddard): Ironic is changing the default value of [deploy] +# default_boot_option from 'netboot' to 'local'. If the option is not set, +# ironic will log a warning during the transition period. Even so, +# kolla-ansible should not set a value for this option as the warning is +# intended to inform operators of the impending change. The warning may be +# suppressed by the deployer by setting a value for the option. + [DEFAULT] debug = {{ ironic_logging_debug }} @@ -58,8 +65,6 @@ memcache_servers = {{ memcached_servers }} memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %} {%- endif %} -[deploy] -default_boot_option = netboot [glance] glance_api_servers = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ glance_api_port }}