Merge "vnc_api-health_check feature is enabled in kubemanager"

Juniper · Sep 11, 2020 · 596d36a · 596d36a
2 parents 87001ad + 6edf636
commit 596d36a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/container/kube-manager/kube_manager/tests/vnc/vnc_api_mock.py b/src/container/kube-manager/kube_manager/tests/vnc/vnc_api_mock.py
@@ -14,7 +14,8 @@ class VncApiMock(object):
     """
 
     def __init__(self, admin_user, admin_password, admin_tenant,
-                 vnc_endpoint_ip, vnc_endpoint_port, auth_token_url):
+                 vnc_endpoint_ip, vnc_endpoint_port, auth_token_url,
+                 api_health_check=False):
 
         for object_type, resource_type in all_resource_type_tuples:
             for oper_str in ('_create', '_read', '_update', '_delete', 's_list', '_get_default_id'):

diff --git a/src/container/kube-manager/kube_manager/vnc/vnc_kubernetes.py b/src/container/kube-manager/kube_manager/vnc/vnc_kubernetes.py
@@ -194,7 +194,8 @@ def _vnc_connect(self):
                     self.args.auth_user,
                     self.args.auth_password, self.args.auth_tenant,
                     api_server_list, self.args.vnc_endpoint_port,
-                    auth_token_url=self.args.auth_token_url)
+                    auth_token_url=self.args.auth_token_url,
+                    api_health_check=True)
                 connected = True
                 self.connection_state_update(ConnectionStatus.UP)
             except requests.exceptions.ConnectionError as e: