From 314d6c5658b7a0c141c1ad1243b2763af48a925f Mon Sep 17 00:00:00 2001
From: Jeremy Grant <jeremy.grant@outlook.com>
Date: Mon, 3 Apr 2017 09:42:17 -0500
Subject: [PATCH] Configure Swift Endpoint Typei
Updated the template for ironic.conf to enable configuration of
the swift url endpoint type within ironic.conf
Change-Id: I67f64167914d6e3e9fddb57e5e38dc03757ae5c7
---
defaults/main.yml | 1 +
templates/ironic.conf.j2 | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/defaults/main.yml b/defaults/main.yml
index 1fbbd2eb..a04dbf07 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -79,6 +79,7 @@ ironic_service_in_ldap: False
# Ironic image store information
ironic_swift_image_container: glance_images
ironic_swift_api_version: v1
+ironic_swift_url_endpoint_type: swift
# The ironic swift auth account and swift endpoints will be generated using the
# known swift data as provided by swift stat. If you wish to set either of these
# items to something else define these variables.
diff --git a/templates/ironic.conf.j2 b/templates/ironic.conf.j2
index 082a4808..a6efd644 100644
--- a/templates/ironic.conf.j2
+++ b/templates/ironic.conf.j2
@@ -60,7 +60,7 @@ swift_container = {{ ironic_swift_image_container }}
swift_endpoint_url = {{ ironic_swift_endpoint }}
swift_account = {{ ironic_swift_auth_account }}
swift_api_version = {{ ironic_swift_api_version }}
-temp_url_endpoint_type = swift
+temp_url_endpoint_type = {{ ironic_swift_url_endpoint_type }}
{% endif %}
[iboot]