Region configuration for OC4
PROD-21520
Change-Id: Iccecbf27f2335ce6a452174c47c01758bd6915b3
diff --git a/opencontrail/files/4.0/config.global.js b/opencontrail/files/4.0/config.global.js
index 47b1dfc..1ee6200 100644
--- a/opencontrail/files/4.0/config.global.js
+++ b/opencontrail/files/4.0/config.global.js
@@ -75,7 +75,7 @@
config.regions = {};
{%- if web.identity.engine != "none" %}
-config.regions.RegionOne = 'http://{{ web.identity.host }}:5000/v{{ web.identity.version }}';
+config.regions.['{{ web.identity.get("region", "RegionOne") }}'] = 'http://{{ web.identity.host }}:5000/v{{ web.identity.version }}';
{%- endif %}
/****************************************************************************
diff --git a/opencontrail/files/4.0/contrail-keystone-auth.conf b/opencontrail/files/4.0/contrail-keystone-auth.conf
index f3aeb94..5912436 100644
--- a/opencontrail/files/4.0/contrail-keystone-auth.conf
+++ b/opencontrail/files/4.0/contrail-keystone-auth.conf
@@ -11,6 +11,7 @@
admin_password={{ config.identity.password }}
admin_tenant_name={{ config.identity.tenant }}
insecure=True
+region_name={{ config.identity.get("region", "RegionOne") }}
{%- if config.cache is defined %}
#memcache_servers=127.0.0.1:11211
memcache_servers={% for member in config.cache.members %}{{ member.host }}:{{ member.port }}{% if not loop.last %},{% endif %}{% endfor %}
diff --git a/opencontrail/files/4.0/contrail-svc-monitor.conf b/opencontrail/files/4.0/contrail-svc-monitor.conf
index 8d6fb7a..8ebc4ee 100644
--- a/opencontrail/files/4.0/contrail-svc-monitor.conf
+++ b/opencontrail/files/4.0/contrail-svc-monitor.conf
@@ -7,7 +7,6 @@
zk_server_ip={% for member in config.database.members %}{{ member.host }}:2181{% if not loop.last %},{% endif %}{% endfor %}
log_file=/var/log/contrail/contrail-svc-monitor.log
cassandra_server_list={% for member in config.database.members %}{{ member.host }}:9161 {% endfor %}
-region_name=RegionOne
#nova_endpoint_type=publicURL
log_local=1
log_level=SYS_NOTICE