From 28c06a27047d6556b07548d8645bfca375dd75b5 Mon Sep 17 00:00:00 2001 From: Albert Mikaelyan Date: Fri, 2 Mar 2018 18:56:53 +0200 Subject: [PATCH] Move ironic_glance_api_servers variable into role As part of cleaning inventory variables, we are moving some of the variables to be created in roles instead of in inventory. This moves the ironic_glance_api_servers variable into role. Change-Id: I983a20d923384bf54cb0af924ec0a0f8ef4db191 --- defaults/main.yml | 3 +++ templates/ironic.conf.j2 | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index 72c7925c..d8429f65 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -18,6 +18,9 @@ # Verbosity Options 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 # Options are 'present' and 'latest' ironic_package_state: "latest" diff --git a/templates/ironic.conf.j2 b/templates/ironic.conf.j2 index a9d10da0..a8302214 100644 --- a/templates/ironic.conf.j2 +++ b/templates/ironic.conf.j2 @@ -58,7 +58,7 @@ dhcp_provider = {{ ironic_dhcp_provider }} [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 = {{ ironic_glance_api_servers }} {% if not ironic_standalone | bool %} swift_temp_url_key = {{ ironic_swift_temp_url_secret_key }} swift_container = {{ ironic_swift_image_container }}