openstack/kolla-ansible
Code Issues Proposed changes

Merge "Revert "Add default_boot_option configuration""

Browse Source
This commit is contained in:
Jenkins 2017-07-19 08:02:19 +00:00 committed by Gerrit Code Review
commit f28863d547
1 changed files with 7 additions and 2 deletions

9
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] [DEFAULT]
debug = {{ ironic_logging_debug }} debug = {{ ironic_logging_debug }}
@ -41,8 +48,6 @@ memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} memcache_secret_key = {{ memcache_secret_key }}
memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %} memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %}
[deploy]
default_boot_option = netboot
[glance] [glance]
glance_api_servers = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ glance_api_port }} glance_api_servers = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ glance_api_port }}