From 0e2b8dab64a704fe01415b71365e23e618e783a5 Mon Sep 17 00:00:00 2001 From: Megh Bhatt Date: Thu, 21 Jul 2016 10:44:17 -0700 Subject: [PATCH] Fabric changes to rename analytics_multi_tenancy to analytics_aaa_mode Rename analytics_multi_tenancy to analytics_aaa_mode which can have values "no-auth" and "cloud-admin-only". Also set it to "cloud-admin-only" by default Change-Id: Ic0348e06dfc717d09686dbed96c6b9df08740fb1 Partial-Bug: #1599654 --- fabfile/utils/commandline.py | 6 ++++-- fabfile/utils/multitenancy.py | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/fabfile/utils/commandline.py b/fabfile/utils/commandline.py index fca163c66..b8b245789 100644 --- a/fabfile/utils/commandline.py +++ b/fabfile/utils/commandline.py @@ -564,7 +564,9 @@ def frame_vnc_collector_cmd(host_string, cmd='setup-vnc-collector'): cmd += " --cassandra_user %s" % cassandra_user cmd += " --cassandra_password %s" % cassandra_password - if get_analytics_mt_enable() and orchestrator == 'openstack': - cmd += " --multi_tenancy" + analytics_aaa_mode = get_analytics_aaa_mode() + if orchestrator != 'openstack': + analytics_aaa_mode = 'no-auth' + cmd += " --aaa_mode %s" % analytics_aaa_mode return cmd diff --git a/fabfile/utils/multitenancy.py b/fabfile/utils/multitenancy.py index f4f097e8f..6b6416f58 100644 --- a/fabfile/utils/multitenancy.py +++ b/fabfile/utils/multitenancy.py @@ -6,8 +6,8 @@ def get_mt_enable(): return getattr(testbed, 'multi_tenancy', True) #end _get_mt_ena -def get_analytics_mt_enable(): - return getattr(testbed, 'analytics_multi_tenancy', False) +def get_analytics_aaa_mode(): + return getattr(testbed, 'analytics_aaa_mode', 'cloud-admin-only') # end get_analytics_mt_enable def get_mt_opts():