openstack/openstack-ansible-os_ironic
Code Issues Proposed changes

Merge "Handle Pike deprecations for Ironic"

Browse Source
This commit is contained in:
Zuul 2018-02-11 04:01:00 +00:00 committed by Gerrit Code Review
commit fc39440b08
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
defaults/main.yml
View File

@ -250,7 +250,6 @@ ironic_uwsgi_bind_address: 0.0.0.0
### OpenStack Services to integrate with ### OpenStack Services to integrate with
# Glance # Glance
# ironic_glance_host: x.x.x.x
ironic_glance_auth_strategy: "{{ ironic_openstack_auth_strategy }}" ironic_glance_auth_strategy: "{{ ironic_openstack_auth_strategy }}"
# Neutron # Neutron

6
templates/ironic.conf.j2
View File

@ -44,6 +44,9 @@ pool_timeout = {{ ironic_db_pool_timeout }}
[deploy] [deploy]
erase_devices_priority = {{ ironic_erase_devices_priority }} erase_devices_priority = {{ ironic_erase_devices_priority }}
{% if not ironic_standalone | bool %}
object_store_endpoint_type = {{ ironic_swift_url_endpoint_type }}
{% endif %}
[dhcp] [dhcp]
dhcp_provider = {{ ironic_dhcp_provider }} dhcp_provider = {{ ironic_dhcp_provider }}
@ -53,6 +56,8 @@ dhcp_provider = {{ ironic_dhcp_provider }}
[disk_utils] [disk_utils]
[glance] [glance]
# TODO(evrardjp): Remove this in the future to use the service catalog
# and reduce the amount of variables.
glance_api_servers = {{ glance_api_servers }} glance_api_servers = {{ glance_api_servers }}
{% if not ironic_standalone | bool %} {% if not ironic_standalone | bool %}
swift_temp_url_key = {{ ironic_swift_temp_url_secret_key }} swift_temp_url_key = {{ ironic_swift_temp_url_secret_key }}
@ -60,7 +65,6 @@ swift_container = {{ ironic_swift_image_container }}
swift_endpoint_url = {{ ironic_swift_endpoint }} swift_endpoint_url = {{ ironic_swift_endpoint }}
swift_account = {{ ironic_swift_auth_account }} swift_account = {{ ironic_swift_auth_account }}
swift_api_version = {{ ironic_swift_api_version }} swift_api_version = {{ ironic_swift_api_version }}
temp_url_endpoint_type = {{ ironic_swift_url_endpoint_type }}
{% endif %} {% endif %}
[iboot] [iboot]