commit e1f2af6433bfae9b098cc6cdbccda5e635e05c2b
Author: Megh Bhatt <email address hidden>
Date: Sat Jun 11 01:11:32 2016 -0700
1. Add provisioning of cloud_admin_access_only
Enable cloud_admin_access_only by default. Add a parameter --no_multi_tenancy
to setup-vnc-collector to disable cloud_admin_access_only. Remove templates
for ini files for contrail-analytics-api, contrail-collector, and
contrail-query-engine and for conf file of contrail-analytics-api
Partial-Bug: #1461175
(cherry picked from commit ec3c1741b5a2f7b49bc18a6b85421e0584c2494e)
Reviewed: https:/ /review. opencontrail. org/22498 github. org/Juniper/ contrail- provisioning/ commit/ e1f2af6433bfae9 b098cc6cdbccda5 e635e05c2b
Committed: http://
Submitter: Zuul
Branch: R3.0
commit e1f2af6433bfae9 b098cc6cdbccda5 e635e05c2b
Author: Megh Bhatt <email address hidden>
Date: Sat Jun 11 01:11:32 2016 -0700
1. Add provisioning of cloud_admin_ access_ only
Enable cloud_admin_ access_ only by default. Add a parameter --no_multi_tenancy access_ only. Remove templates analytics- api, contrail-collector, and query-engine and for conf file of contrail- analytics- api
to setup-vnc-collector to disable cloud_admin_
for ini files for contrail-
contrail-
Partial-Bug: #1461175 49bc18a6b85421e 0584c2494e)
(cherry picked from commit ec3c1741b5a2f7b
Conflicts: provisioning/ collector/ setup.py
contrail_
2. Rename multi_tenancy to aaa_mode for analytics API
Partial-Bug: #1599654 8dc63a278ae9ecc 0cad3a2c5d)
(cherry picked from commit 97c3c396de54d11
Conflicts: provisioning/ collector/ setup.py
contrail_
3. Fix provisioning failure in setup-vnc-collector
Configure memcache servers in /etc/contrail/ contrail- keystone- auth.conf
only from config node setup
Closes-Bug: #1606654 4e342dfa5d4105c 82107826a4)
(cherry picked from commit 98de6812efad7c4
Conflicts: provisioning/ common/ base.py
contrail_
4. Rename multi_tenancy to aaa_mode in upgrade path for analytics node
Closes-Bug: #1607469 873436d31f630c1 55f4d1d07e)
(cherry picked from commit b8f4c6906a6f643
5. 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
Partial-Bug: #1607563 2f12261a173bff3 4202366f8b)
(cherry picked from commit 3e8d8412dc8f9e5
Conflicts: provisioning/ collector/ setup.py
contrail_
Change-Id: I56dd3e14a7a2ad 8d676decf3dbbb2 170170a957b