Changes to bring analytics authenticated access in sync with config

1. Rename aaa_mode value cloud-admin-only to cloud-admin
2. CLOUD_ADMIN_ROLE defaults to admin instead of cloud-admin

Change-Id: I7c08d9fda72d8a4197cad4e12749d23dac163742
Partial-Bug: #1607563

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',
-            'aaa_mode': 'cloud-admin-only',
+            'aaa_mode': 'cloud-admin',
             'keystone_version': 'v2.0',
         }
 
@@ -88,7 +88,9 @@ def parse_args(self, args_str):
         parser.add_argument("--keystone_version", choices=['v2.0', 'v3'],
             help = "Keystone Version")
         parser.add_argument("--aaa_mode", help="AAA mode",
-            choices=['no-auth', 'cloud-admin-only'])
+            choices=['no-auth', 'cloud-admin', 'cloud-admin-only'])
+        parser.add_argument("--cloud_admin_role",
+            help="Name of cloud-admin role")
         parser.add_argument("--cassandra_user", help="Cassandra user name",
             default= None)
         parser.add_argument("--cassandra_password", help="Cassandra password",
@@ -315,7 +317,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',
-            'aaa_mode' : self._args.aaa_mode,
+            'aaa_mode' : 'cloud-admin' if self._args.aaa_mode == 'cloud-admin-only' else self._args.aaa_mode,
             },
           'REDIS' : {
             'redis_server_port' : 6379,
@@ -328,6 +330,8 @@ def fixup_contrail_analytics_api(self):
         }
         if self._args.redis_password:
             config_vals['REDIS']['redis_password'] = self._args.redis_password
+        if self._args.cloud_admin_role:
+            config_vals['DEFAULTS']['cloud_admin_role'] = self._args.cloud_admin_role
         for section, parameter_values in config_vals.items():
             for parameter, value in parameter_values.items():
                 self.set_config(conf_file, section, parameter, value)