Rename cloud_admin_access_only to multi_tenancy in contrail-analytics…

…-api Change-Id: Icf141177978df6df3f7c0b026f9134b84f2558d7 Closes-Bug: #1461175
Juniper · Jun 15, 2016 · 36df099 · 36df099
1 parent 8e4e211
commit 36df099
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/opserver/opserver.py b/src/opserver/opserver.py
@@ -776,7 +776,7 @@ def _parse_args(self, args_str=' '.join(sys.argv[1:])):
             'partitions'        : 15,
             'sandesh_send_rate_limit': SandeshSystem. \
                  get_sandesh_send_rate_limit(),
-            'cloud_admin_access_only' : False,
+            'multi_tenancy'     : False,
             'api_server'        : '127.0.0.1:8082',
             'admin_port'        : OpServerAdminPort,
             'cloud_admin_role'  : CLOUD_ADMIN_ROLE,
@@ -905,8 +905,8 @@ def _parse_args(self, args_str=' '.join(sys.argv[1:])):
             help="Sandesh send rate limit in messages/sec")
         parser.add_argument("--cloud_admin_role",
             help="Name of cloud-admin role")
-        parser.add_argument("--cloud_admin_access_only", action="store_true",
-            help="REST API access for cloud-admin role only")
+        parser.add_argument("--multi_tenancy", action="store_true",
+            help="Validate resource permissions (implies token validation)")
         parser.add_argument("--auth_host",
             help="IP address of keystone server")
         parser.add_argument("--auth_protocol",
@@ -942,7 +942,7 @@ def _parse_args(self, args_str=' '.join(sys.argv[1:])):
             self._args.auth_host, self._args.auth_port)
         auth_conf_info['api_server_use_ssl'] = False
         auth_conf_info['cloud_admin_access_only'] = \
-            self._args.cloud_admin_access_only
+            self._args.multi_tenancy
         auth_conf_info['cloud_admin_role'] = self._args.cloud_admin_role
         auth_conf_info['admin_port'] = self._args.admin_port
         api_server_info = self._args.api_server.split(':')