commit 0faa853b62a691766f7a7a7a8afcbe27128440b7
author vmikes <vlastimil.mikes@tcpcloud.eu> Wed Oct 19 09:57:14 2016 +0200
committer vmikes <vlastimil.mikes@tcpcloud.eu> Wed Oct 19 09:58:19 2016 +0200
tree b7bde519b70aeee75796a3e5607d5b8fc18a7a96
parent b72404a339b603d74a865faa075b3c494308ebe7

add region to metadata

Change-Id: I45f80601750f4df41c15ca52ea67174a29815b98

metadata/service/control/cluster.yml

diff --git a/metadata/service/control/cluster.yml b/metadata/service/control/cluster.yml
index 9fabdc4..463a426 100644
--- a/metadata/service/control/cluster.yml
+++ b/metadata/service/control/cluster.yml
@@ -29,6 +29,7 @@
         port: 35357
         user: glance
         password: ${_param:keystone_glance_password}
+        region: RegionOne
         tenant: service
       message_queue:
         engine: rabbitmq

metadata/service/control/container.yml

diff --git a/metadata/service/control/container.yml b/metadata/service/control/container.yml
index 0ea8b07..f8d0f98 100644
--- a/metadata/service/control/container.yml
+++ b/metadata/service/control/container.yml
@@ -30,6 +30,7 @@
                   port: 35357
                   user: glance
                   password: ${_param:keystone_glance_password}
+                  region: RegionOne
                   tenant: service
                 message_queue:
                   engine: rabbitmq

metadata/service/control/single.yml

diff --git a/metadata/service/control/single.yml b/metadata/service/control/single.yml
index af1dc11..2f23a6b 100644
--- a/metadata/service/control/single.yml
+++ b/metadata/service/control/single.yml
@@ -27,6 +27,7 @@
         port: 35357
         user: glance
         password: ${_param:keystone_glance_password}
+        region: RegionOne
         tenant: service
       message_queue:
         engine: rabbitmq

tests/pillar/cluster.sls

diff --git a/tests/pillar/cluster.sls b/tests/pillar/cluster.sls
index 97a2d61..fef0501 100644
--- a/tests/pillar/cluster.sls
+++ b/tests/pillar/cluster.sls
@@ -24,6 +24,7 @@
       port: 35357
       user: glance
       password: password
+      region: RegionOne
       tenant: service
     message_queue:
       engine: rabbitmq

tests/pillar/single.sls

diff --git a/tests/pillar/single.sls b/tests/pillar/single.sls
index 7512001..89dd253 100644
--- a/tests/pillar/single.sls
+++ b/tests/pillar/single.sls
@@ -22,6 +22,7 @@
       port: 35357
       user: glance
       password: password
+      region: RegionOne
       tenant: service
     message_queue:
       engine: rabbitmq

tests/pillar/single_ceph.sls

diff --git a/tests/pillar/single_ceph.sls b/tests/pillar/single_ceph.sls
index e4e9791..5e28763 100644
--- a/tests/pillar/single_ceph.sls
+++ b/tests/pillar/single_ceph.sls
@@ -21,6 +21,7 @@
       port: 35357
       user: glance
       password: password
+      region: RegionOne
       tenant: service
     message_queue:
       engine: rabbitmq