commit 5ffe2b354ed5fb48310b292bffef41a887619950
author Vasyl Saienko <vsaienko@mirantis.com> Mon Dec 17 12:51:54 2018 +0200
committer Vasyl Saienko <vsaienko@mirantis.com> Mon Dec 17 12:52:52 2018 +0200
tree e65ebba7b562852fa59844d11b9c0a7713c7c2d0
parent cd3ed47d408d05038d0bfaee4194255a38250c77

Pick default region from openstack_region for ironic

This patch makes sures ironic pick default region
from _param:openstack_region.

Change-Id: I35fd1db8d1af8a55d9275407aef153b4dba7f0d3
Related-Prod: PROD-25905

ironic/api/cluster.yml

diff --git a/ironic/api/cluster.yml b/ironic/api/cluster.yml
index 5bbf8ce..aa45ec2 100644
--- a/ironic/api/cluster.yml
+++ b/ironic/api/cluster.yml
@@ -38,3 +38,5 @@
           enabled: ${_param:ironic_memcache_security_enabled}
           strategy: ${_param:openstack_memcache_security_strategy}
           secret_key: ${_param:ironic_memcache_secret_key}
+      identity:
+        region: ${_param:openstack_region}

ironic/api/single.yml

diff --git a/ironic/api/single.yml b/ironic/api/single.yml
index cdd6b58..5eb290b 100644
--- a/ironic/api/single.yml
+++ b/ironic/api/single.yml
@@ -36,3 +36,5 @@
           enabled: ${_param:ironic_memcache_security_enabled}
           strategy: ${_param:openstack_memcache_security_strategy}
           secret_key: ${_param:ironic_memcache_secret_key}
+      identity:
+        region: ${_param:openstack_region}

ironic/conductor/cluster.yml

diff --git a/ironic/conductor/cluster.yml b/ironic/conductor/cluster.yml
index 7038095..3478413 100644
--- a/ironic/conductor/cluster.yml
+++ b/ironic/conductor/cluster.yml
@@ -34,3 +34,5 @@
           enabled: ${_param:ironic_memcache_security_enabled}
           strategy: ${_param:openstack_memcache_security_strategy}
           secret_key: ${_param:ironic_memcache_secret_key}
+      identity:
+        region: ${_param:openstack_region}

ironic/conductor/single.yml

diff --git a/ironic/conductor/single.yml b/ironic/conductor/single.yml
index f2855cc..36d92be 100644
--- a/ironic/conductor/single.yml
+++ b/ironic/conductor/single.yml
@@ -35,3 +35,5 @@
           enabled: ${_param:ironic_memcache_security_enabled}
           strategy: ${_param:openstack_memcache_security_strategy}
           secret_key: ${_param:ironic_memcache_secret_key}
+      identity:
+        region: ${_param:openstack_region}

ironic/conductor/storage/cinder.yml

diff --git a/ironic/conductor/storage/cinder.yml b/ironic/conductor/storage/cinder.yml
index 17f23e5..8e5ea12 100644
--- a/ironic/conductor/storage/cinder.yml
+++ b/ironic/conductor/storage/cinder.yml
@@ -9,3 +9,4 @@
         project_name: service
         user_domain_name: Default
         username: cinder
+        region: ${_param:openstack_region}