commit 7d0455d0488ac21d5c9cf705f19d0c7b9e08eb8e
author Vasyl Saienko <vsaienko@mirantis.com> Thu Dec 06 14:43:56 2018 +0200
committer Vasyl Saienko <vsaienko@mirantis.com> Thu Dec 06 14:43:56 2018 +0200
tree ec275a27655ffd4b9a120a4df81309e343dcf8c3
parent 99596fae20a0562afeb10648c560edec125a3c9a

Set admin_region option correctly for keystone:server

Change-Id: Ic9916b5772b01d43cf6d72e0911495b1f78a6b7d
Related-Prod: PROD-25490

keystone/server/cluster.yml

diff --git a/keystone/server/cluster.yml b/keystone/server/cluster.yml
index 95884e7..d64a6cb 100644
--- a/keystone/server/cluster.yml
+++ b/keystone/server/cluster.yml
@@ -34,13 +34,14 @@
       admin_password: ${_param:keystone_admin_password}
       admin_email: ${_param:admin_email}
       role: ${_param:openstack_node_role}
+      admin_region: ${_param:openstack_region}
+      region: ${_param:openstack_region}
       bind:
         address: ${_param:cluster_local_address}
         private_address: ${_param:cluster_vip_address}
         private_port: 35357
         public_address: ${_param:cluster_vip_address}
         public_port: 5000
-      region: ${_param:openstack_region}
       database:
         engine: mysql
         host: ${_param:openstack_database_address}

keystone/server/single.yml

diff --git a/keystone/server/single.yml b/keystone/server/single.yml
index c792bf5..6996968 100644
--- a/keystone/server/single.yml
+++ b/keystone/server/single.yml
@@ -33,13 +33,14 @@
       admin_password: ${_param:keystone_admin_password}
       admin_email: ${_param:admin_email}
       role: ${_param:openstack_node_role}
+      admin_region: ${_param:openstack_region}
+      region: ${_param:openstack_region}
       bind:
         address: ${_param:single_address}
         private_address: ${_param:single_address}
         private_port: 35357
         public_address: ${_param:single_address}
         public_port: 5000
-      region: ${_param:openstack_region}
       database:
         engine: mysql
         host: ${_param:single_address}