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():