fix no identity and https port
PROD-17457
Change-Id: If3aea05e663d52778432ed9202fe7651f80b040b
diff --git a/opencontrail/files/4.0/config.global.js b/opencontrail/files/4.0/config.global.js
index c5ceb47..47b1dfc 100644
--- a/opencontrail/files/4.0/config.global.js
+++ b/opencontrail/files/4.0/config.global.js
@@ -73,7 +73,10 @@
*
****************************************************************************/
config.regions = {};
+
+{%- if web.identity.engine != "none" %}
config.regions.RegionOne = 'http://{{ web.identity.host }}:5000/v{{ web.identity.version }}';
+{%- endif %}
/****************************************************************************
* This boolean flag indicates if serviceEndPointFromConfig is set as false,
@@ -284,7 +287,7 @@
config.http_port = '{{ web.get("http",{}).get("port","8080") }}';
// HTTPS port for NodeJS Server.
-config.https_port = '{{ web.get("https",{}).get("port","8080") }}';
+config.https_port = '{{ web.get("https",{}).get("port","8143") }}';
// Activate/Deactivate Login.
config.require_auth = false;
diff --git a/opencontrail/files/4.0/contrail-svc-monitor.conf b/opencontrail/files/4.0/contrail-svc-monitor.conf
index 3078cc3..8d6fb7a 100644
--- a/opencontrail/files/4.0/contrail-svc-monitor.conf
+++ b/opencontrail/files/4.0/contrail-svc-monitor.conf
@@ -36,8 +36,11 @@
# Driver to use for scheduling virtual machine of a NetNS service instance to a
# vrouter agent
# si_netns_scheduler_driver = svc_monitor.scheduler.vrouter_scheduler.RandomScheduler
+{%- if config.identity.engine == "none" %}
+aaa_mode=no-auth
+{%- endif %}
-[KEYSTONE]
+#[KEYSTONE]
#auth_host=127.0.0.1
#admin_user=
#admin_password=