From 97c3c396de54d118dc63a278ae9ecc0cad3a2c5d Mon Sep 17 00:00:00 2001 From: Megh Bhatt Date: Tue, 12 Jul 2016 16:12:27 -0700 Subject: [PATCH] Rename multi_tenancy to aaa_mode for analytics API Change-Id: I0c0739ec41e907c968af5ffcf2b77d19d4efaa21 Partial-Bug: #1599654 --- contrail_provisioning/collector/setup.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contrail_provisioning/collector/setup.py b/contrail_provisioning/collector/setup.py index 3068a9a7..195b8ddf 100755 --- a/contrail_provisioning/collector/setup.py +++ b/contrail_provisioning/collector/setup.py @@ -30,7 +30,7 @@ def __init__(self, args_str = None): 'keystone_service_tenant_name' : 'service', 'keystone_auth_protocol': 'http', 'keystone_auth_port': '35357', - 'multi_tenancy': False, + 'aaa_mode': 'cloud-admin-only', 'keystone_version': 'v2.0', } @@ -87,8 +87,8 @@ def parse_args(self, args_str): default = 'False') parser.add_argument("--keystone_version", choices=['v2.0', 'v3'], help = "Keystone Version") - parser.add_argument("--multi_tenancy", help = "Enforce resource permissions (implies token validation)", - action="store_true") + parser.add_argument("--aaa_mode", help="AAA mode", + choices=['no-auth', 'cloud-admin-only']) parser.add_argument("--cassandra_user", help="Cassandra user name", default= None) parser.add_argument("--cassandra_password", help="Cassandra password", @@ -314,7 +314,7 @@ def fixup_contrail_analytics_api(self): 'analytics_statistics_ttl' : self._args.analytics_statistics_ttl, 'analytics_flow_ttl' : self._args.analytics_flow_ttl, 'api_server' : self._args.cfgm_ip + ':8082', - 'multi_tenancy' : self._args.multi_tenancy, + 'aaa_mode' : self._args.aaa_mode, }, 'REDIS' : { 'redis_server_port' : 6379,