add region to metadata

Change-Id: I45f80601750f4df41c15ca52ea67174a29815b98
2016-10-19 09:57:14 +02:00 · 2016-10-19 09:57:14 +02:00 · 0faa853b62
commit 0faa853b62
parent b72404a339
6 changed files with 6 additions and 0 deletions
--- a/metadata/service/control/cluster.yml
+++ b/metadata/service/control/cluster.yml
@ -29,6 +29,7 @@ parameters:
        port: 35357
        user: glance
        password: ${_param:keystone_glance_password}
+        region: RegionOne
        tenant: service
      message_queue:
        engine: rabbitmq
--- a/metadata/service/control/container.yml
+++ b/metadata/service/control/container.yml
@ -30,6 +30,7 @@ parameters:
                  port: 35357
                  user: glance
                  password: ${_param:keystone_glance_password}
+                  region: RegionOne
                  tenant: service
                message_queue:
                  engine: rabbitmq
--- a/metadata/service/control/single.yml
+++ b/metadata/service/control/single.yml
@ -27,6 +27,7 @@ parameters:
        port: 35357
        user: glance
        password: ${_param:keystone_glance_password}
+        region: RegionOne
        tenant: service
      message_queue:
        engine: rabbitmq
--- a/tests/pillar/cluster.sls
+++ b/tests/pillar/cluster.sls
@ -24,6 +24,7 @@ glance:
      port: 35357
      user: glance
      password: password
+      region: RegionOne
      tenant: service
    message_queue:
      engine: rabbitmq
--- a/tests/pillar/single.sls
+++ b/tests/pillar/single.sls
@ -22,6 +22,7 @@ glance:
      port: 35357
      user: glance
      password: password
+      region: RegionOne
      tenant: service
    message_queue:
      engine: rabbitmq
--- a/tests/pillar/single_ceph.sls
+++ b/tests/pillar/single_ceph.sls
@ -21,6 +21,7 @@ glance:
      port: 35357
      user: glance
      password: password
+      region: RegionOne
      tenant: service
    message_queue:
      engine: rabbitmq