LBaaS scheduler should not use hardcoded tenant name

This fix removes the hardcoded 'admin' tenant name from lbaas scheduler and reads the tenant from config. It also fixes the default admin_tenant_name in svc_monitor.py to 'admin'. Closes-Bug: #1543296 Change-Id: If5e558e27ef6fd81d81cf56a317f39dbac2854ce
Juniper · Feb 19, 2016 · cb279b2 · cb279b2
1 parent 3c0e649
commit cb279b2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/config/svc-monitor/svc_monitor/scheduler/vrouter_scheduler.py b/src/config/svc-monitor/svc_monitor/scheduler/vrouter_scheduler.py
@@ -65,7 +65,8 @@ def _get_candidates(self, si_uuid, vm_uuid):
         vr_list = []
         if self._args.netns_availability_zone:
             az_list = self._nc.oper('availability_zones', 'list',
-                                    'admin', detailed=True)
+                                    self._args.admin_tenant_name,
+                                    detailed=True)
             for az in az_list:
                 if self._args.netns_availability_zone in str(az):
                     for host in az.hosts:

diff --git a/src/config/svc-monitor/svc_monitor/svc_monitor.py b/src/config/svc-monitor/svc_monitor/svc_monitor.py
@@ -1012,7 +1012,7 @@ def parse_args(args_str):
         'auth_insecure': True,
         'admin_user': 'user1',
         'admin_password': 'password1',
-        'admin_tenant_name': 'default-domain',
+        'admin_tenant_name': 'admin',
         'certfile': '',
         'keyfile': '',
         'cafile': ''