Comment 29 for bug 1550650

Reviewed: https://review.opencontrail.org/18329
Committed: http://github.org/Juniper/contrail-server-manager/commit/3669b824829e823bb3d7f3de1788beb689a4f978
Submitter: Zuul
Branch: R3.0

commit 3669b824829e823bb3d7f3de1788beb689a4f978
Author: Abhay Joshi <email address hidden>
Date: Thu Mar 10 15:53:48 2016 -0800

Closes-Bug: #1550650
When upgrading from 2.2x code to 3.0, keystone.conf admin_token is changed to newly generated value,
however all other contrail files which used to have admin_token in 2.2x code and were generated with
value from 2.2x code retained the old value. In 3.x code, none of the contrail files use token, but since
in upgrade case, old files were retained and had token, we had token mismatch in config files and this resulted
in openstack neutron commands failing on upgrade.
The change is to use the admin_token value from cluster.json (will be the case when cluster is created with 2.2x SM)
in SM 3.0 when populating hiera data for openstack. If cluster.json does not have admin_token, then only use
generated value.
Tested : Successful upgrade from contrail 2.22b117 provisioned using SM 2.22build117, then upgrade SM to R3.0b2723 and
upgrade contrail to 3.0B2723.
Also tested fresh provision of contrail 3.0b 2723 with SM 3.0b2723.

Change-Id: Ieec1645bf9c340a5db8b47fcbc0771aebc9847eb