openstack/openstack-ansible-os_ironic
Code Issues Proposed changes

Merge "Move ironic_glance_api_servers variable into role"

Browse Source
This commit is contained in:
Zuul 2018-05-18 12:43:14 +00:00 committed by Gerrit Code Review
commit 58f575843d
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
defaults/main.yml
View File

@ -18,6 +18,9 @@
# Verbosity Options # Verbosity Options
debug: False debug: False
# Comma separated list of Glance API servers
ironic_glance_api_servers: "{{ (glance_service_internalurl | default('http://localhost')) | netorigin }}"
# Set the package install state for distribution and pip packages # Set the package install state for distribution and pip packages
# Options are 'present' and 'latest' # Options are 'present' and 'latest'
ironic_package_state: "latest" ironic_package_state: "latest"

2
templates/ironic.conf.j2
View File

@ -58,7 +58,7 @@ dhcp_provider = {{ ironic_dhcp_provider }}
[glance] [glance]
# TODO(evrardjp): Remove this in the future to use the service catalog # TODO(evrardjp): Remove this in the future to use the service catalog
# and reduce the amount of variables. # and reduce the amount of variables.
glance_api_servers = {{ glance_api_servers }} glance_api_servers = {{ ironic_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 }}
swift_container = {{ ironic_swift_image_container }} swift_container = {{ ironic_swift_image_container }}