Glance keystone region support added
Change-Id: I23186591204e157389a02850fcf27b0d79d08753
diff --git a/README.rst b/README.rst
index a1cfa52..32fbf92 100644
--- a/README.rst
+++ b/README.rst
@@ -68,6 +68,22 @@
source: http://cdn.download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-disk.img
public: true
+Keystone and cinder region
+============================
+
+.. code-block:: yaml
+
+ glance:
+ server:
+ enabled: true
+ version: kilo
+ ...
+ identity:
+ engine: keystone
+ host: 127.0.0.1
+ region: RegionTwo
+ ...
+
Ceph integration glance
=======================
diff --git a/glance/files/kilo/glance-api.conf.Debian b/glance/files/kilo/glance-api.conf.Debian
index a4678b9..f78701c 100644
--- a/glance/files/kilo/glance-api.conf.Debian
+++ b/glance/files/kilo/glance-api.conf.Debian
@@ -214,6 +214,9 @@
#auth_url = None
# Keystone region
#auth_region = None
+{% if server.identity.region is defined %}
+auth_region = {{ server.identity.region }}
+{% endif %}
# Auth strategy
#auth_strategy = keystone
@@ -803,7 +806,9 @@
# Region name of this node (string value)
#os_region_name = <None>
-
+{% if server.identity.region is defined %}
+os_region_name = {{ server.identity.region }}
+{% endif %}
# Location of ca certicates file to use for cinder client requests
# (string value)
#cinder_ca_certificates_file = <None>
diff --git a/glance/files/kilo/glance-cache.conf.Debian b/glance/files/kilo/glance-cache.conf.Debian
index 6e5888c..2b835fe 100644
--- a/glance/files/kilo/glance-cache.conf.Debian
+++ b/glance/files/kilo/glance-cache.conf.Debian
@@ -193,6 +193,9 @@
# Region name of this node (string value)
#os_region_name = <None>
+{% if server.identity.region is defined %}
+os_region_name = {{ server.identity.region }}
+{% endif %}
# Location of ca certicates file to use for cinder client requests
# (string value)
diff --git a/glance/files/liberty/glance-api.conf.Debian b/glance/files/liberty/glance-api.conf.Debian
index fdd55e6..c375d6f 100644
--- a/glance/files/liberty/glance-api.conf.Debian
+++ b/glance/files/liberty/glance-api.conf.Debian
@@ -214,6 +214,9 @@
#auth_url = None
# Keystone region
#auth_region = None
+{% if server.identity.region is defined %}
+auth_region = {{ server.identity.region }}
+{% endif %}
# Auth strategy
#auth_strategy = keystone
@@ -802,7 +805,9 @@
# Region name of this node (string value)
#os_region_name = <None>
-
+{% if server.identity.region is defined %}
+os_region_name = {{ server.identity.region }}
+{% endif %}
# Location of ca certicates file to use for cinder client requests
# (string value)
#cinder_ca_certificates_file = <None>
diff --git a/glance/files/liberty/glance-cache.conf.Debian b/glance/files/liberty/glance-cache.conf.Debian
index 6e5888c..2b835fe 100644
--- a/glance/files/liberty/glance-cache.conf.Debian
+++ b/glance/files/liberty/glance-cache.conf.Debian
@@ -193,6 +193,9 @@
# Region name of this node (string value)
#os_region_name = <None>
+{% if server.identity.region is defined %}
+os_region_name = {{ server.identity.region }}
+{% endif %}
# Location of ca certicates file to use for cinder client requests
# (string value)