Skip to content

Commit

Permalink
Fabric changes to rename analytics_multi_tenancy to analytics_aaa_mode
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Megh Bhatt committed Jul 26, 2016
1 parent 891d609 commit 0e2b8da
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
6 changes: 4 additions & 2 deletions fabfile/utils/commandline.py
Expand Up @@ -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

4 changes: 2 additions & 2 deletions fabfile/utils/multitenancy.py
Expand Up @@ -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():
Expand Down

0 comments on commit 0e2b8da

Please sign in to comment.