aboutsummaryrefslogtreecommitdiffstats
path: root/boot
diff options
context:
space:
mode:
authorMarco Platania <platania@research.att.com>2017-05-12 09:57:32 -0400
committerMarco Platania <platania@research.att.com>2017-05-12 09:57:32 -0400
commit4aac07a3628defdb97e9d54145aadd7263497641 (patch)
treea45aa2a24921235096f2f8abf12443680ec95c34 /boot
parent00929652c87ccd38b2d526bd2d382c31673928ab (diff)
[MSO-15] Add cloud_sites instructions to MSO
Change-Id: Ie247d23ac88adf4f3680b87bec8cb17071e4b508 Signed-off-by: Marco Platania <platania@research.att.com>
Diffstat (limited to 'boot')
-rw-r--r--boot/mso_vm_init.sh39
1 files changed, 38 insertions, 1 deletions
diff --git a/boot/mso_vm_init.sh b/boot/mso_vm_init.sh
index 3387a7ae..e39f6b06 100644
--- a/boot/mso_vm_init.sh
+++ b/boot/mso_vm_init.sh
@@ -13,12 +13,49 @@ export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort
if [ -e /opt/config/keystone.txt ]
then
KEYSTONE_URL=$(cat /opt/config/keystone.txt)
+ OPENSTACK_REGION=$(cat /opt/config/openstack_region.txt)
DCP_CLLI="DEFAULT_KEYSTONE"
AUTH_TYPE="USERNAME_PASSWORD"
+ read -d '' CLOUD_SITES <<-EOF
+ "cloud_sites": [{
+ "aic_version": "2.5",
+ "id": "$OPENSTACK_REGION",
+ "identity_service_id": "$DCP_CLLI",
+ "lcp_clli": "$OPENSTACK_REGION",
+ "region_id": "$OPENSTACK_REGION"
+ }],
+EOF
else
KEYSTONE_URL="https://identity.api.rackspacecloud.com/v2.0"
DCP_CLLI="RAX_KEYSTONE"
AUTH_TYPE="RACKSPACE_APIKEY"
+ read -d '' CLOUD_SITES <<-EOF
+ "cloud_sites": [
+ {
+ "id": "Dallas",
+ "aic_version": "2.5",
+ "lcp_clli": "DFW",
+ "region_id": "DFW",
+ "identity_service_id": "$DCP_CLLI"
+ },
+
+ {
+ "id": "Northern Virginia",
+ "aic_version": "2.5",
+ "lcp_clli": "IAD",
+ "region_id": "IAD",
+ "identity_service_id": "$DCP_CLLI"
+ },
+
+ {
+ "id": "Chicago",
+ "aic_version": "2.5",
+ "lcp_clli": "ORD",
+ "region_id": "ORD",
+ "identity_service_id": "$DCP_CLLI"
+ }
+ ],
+EOF
fi
# Update the MSO configuration file.
@@ -35,6 +72,7 @@ read -d '' MSO_CONFIG_UPDATES <<-EOF
},
"mso-po-adapter-config":
{
+ $CLOUD_SITES
"identity_services":
[
{"dcp_clli": "$DCP_CLLI",
@@ -55,7 +93,6 @@ read -d '' MSO_CONFIG_UPDATES <<-EOF
EOF
export MSO_CONFIG_UPDATES
-
# Deploy the environment
cd /opt/test_lab
git pull