Fix default on service level
Change-Id: Iaad474e327cbcd248a1fb2e06e0be36219ebe9d9
diff --git a/metadata/service/control/analytics.yml b/metadata/service/control/analytics.yml
index 3a1d78c..80b6061 100644
--- a/metadata/service/control/analytics.yml
+++ b/metadata/service/control/analytics.yml
@@ -7,6 +7,9 @@
opencontrail_version: 2.2
opencontrail_identity_port: 35357
opencontrail_identity_version: '2.0'
+ keystone_admin_password: 'none'
+ keystone_service_token: 'none'
+ openstack_region: RegionOne
opencontrail:
common:
version: ${_param:opencontrail_version}
@@ -43,7 +46,7 @@
identity:
engine: keystone
version: ${_param:opencontrail_identity_version}
- region: RegionOne
+ region: ${_param:openstack_region}
host: ${_param:cluster_vip_address}
port: ${_param:opencontrail_identity_port}
user: admin
diff --git a/metadata/service/control/cluster.yml b/metadata/service/control/cluster.yml
index c33d67e..844e309 100644
--- a/metadata/service/control/cluster.yml
+++ b/metadata/service/control/cluster.yml
@@ -9,6 +9,7 @@
opencontrail_identity_version: '2.0'
keystone_admin_password: 'none'
keystone_service_token: 'none'
+ openstack_region: RegionOne
opencontrail:
common:
version: ${_param:opencontrail_version}
@@ -53,7 +54,7 @@
identity:
engine: keystone
version: ${_param:opencontrail_identity_version}
- region: RegionOne
+ region: ${_param:openstack_region}
host: ${_param:cluster_vip_address}
port: ${_param:opencontrail_identity_port}
user: admin
diff --git a/metadata/service/control/control.yml b/metadata/service/control/control.yml
index 7728a2e..719f6d0 100644
--- a/metadata/service/control/control.yml
+++ b/metadata/service/control/control.yml
@@ -9,6 +9,7 @@
opencontrail_identity_version: '2.0'
keystone_admin_password: 'none'
keystone_service_token: 'none'
+ openstack_region: RegionOne
opencontrail:
common:
version: ${_param:opencontrail_version}
@@ -53,7 +54,7 @@
identity:
engine: keystone
version: ${_param:opencontrail_identity_version}
- region: RegionOne
+ region: ${_param:openstack_region}
host: ${_param:cluster_vip_address}
port: ${_param:opencontrail_identity_port}
user: admin
diff --git a/metadata/service/control/single.yml b/metadata/service/control/single.yml
index ee4d19e..82313ab 100644
--- a/metadata/service/control/single.yml
+++ b/metadata/service/control/single.yml
@@ -7,6 +7,9 @@
opencontrail_version: 2.2
opencontrail_identity_port: 35357
opencontrail_identity_version: '2.0'
+ keystone_admin_password: 'none'
+ keystone_service_token: 'none'
+ openstack_region: RegionOne
opencontrail:
common:
version: ${_param:opencontrail_version}
@@ -51,7 +54,7 @@
identity:
engine: keystone
version: ${_param:opencontrail_identity_version}
- region: RegionOne
+ region: ${_param:openstack_region}
host: ${_param:single_address}
port: ${_param:opencontrail_identity_port}
user: admin