Comment 21 for bug 1616665

Reviewed: https://review.opencontrail.org/26013
Committed: http://github.org/Juniper/contrail-puppet/commit/639df223d963040a5b887eb6ed7b21d1a1fd153b
Submitter: Zuul
Branch: R3.0.2.x

commit 639df223d963040a5b887eb6ed7b21d1a1fd153b
Author: nitishkrishna <email address hidden>
Date: Tue Aug 30 12:16:30 2016 -0700

Closes-Bug: #1616665 - Missing keystone file, api related params in separate collector scenario

Closes-Bug: #1616666

Three issues:
1. contrail-keystone-auth.conf missing on separate collector/db node
2. Wrong vip set in contrail-snmp-collector.conf if contrail_internal_vip set
3. Missing api_server param in contrail-analytics-api.conf

Closes-Bug: #1641093 - Previously fixed bug now to be fixed in 3.0.2.x

I have cherry picked:

1. https://review.opencontrail.org/#/c/23777/
2. https://review.opencontrail.org/#/c/23746/

Into R3.0.2.x

The bugs above are now fixed in R3.0.2.x also

Please note:
Bug 1618574 will not be fixed in R3.0.2.x (discussed with Megh)

Change-Id: I28fdce93422bf62d6c7f07c81a3fda7874c2d931