Merge "Adds configurable nova endpoint type in svc monitor" into R2.21.x

Juniper · Jun 23, 2016 · 246d7b8 · 246d7b8
2 parents c1e141f + 9de8997
commit 246d7b8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/config/svc-monitor/contrail-svc-monitor.conf b/src/config/svc-monitor/contrail-svc-monitor.conf
@@ -13,6 +13,7 @@ log_level=SYS_NOTICE
 #disc_server_port=5998
 #region_name=None
 cassandra_server_list=127.0.0.1:9160
+#nova_endpoint_type=publicURL
 
 [SECURITY]
 #use_certs=False

diff --git a/src/config/svc-monitor/svc_monitor/nova_client.py b/src/config/svc-monitor/svc_monitor/nova_client.py
@@ -23,7 +23,7 @@ def _novaclient_get(self, proj_name, reauthenticate=False):
             api_key=self._args.admin_password,
             region_name=self._args.region_name, service_type='compute',
             auth_url=auth_url, insecure=self._args.auth_insecure, cacert=self._kscert,
-            endpoint_type='internalURL')
+            endpoint_type=self._args.nova_endpoint_type)
         return self._nova[proj_name]
 
     def _novaclient_exec(self, resource, oper, proj_name,

diff --git a/src/config/svc-monitor/svc_monitor/svc_monitor.py b/src/config/svc-monitor/svc_monitor/svc_monitor.py
@@ -1036,7 +1036,8 @@ def parse_args(args_str):
         'cluster_id': '',
         'check_service_interval': '60',
         'sandesh_send_rate_limit' : SandeshSystem.get_sandesh_send_rate_limit(),
-        }
+        'nova_endpoint_type': 'internalURL',
+    }
     secopts = {
         'use_certs': False,
         'keyfile': '',