aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--boot/mso_vm_init.sh39
-rw-r--r--heat/OpenECOMP/onap_openstack.env4
-rw-r--r--heat/OpenECOMP/onap_openstack.yaml2
-rw-r--r--heat/OpenECOMP/onap_openstack_float.env4
-rw-r--r--heat/OpenECOMP/onap_openstack_float.yaml2
-rw-r--r--heat/OpenECOMP/onap_openstack_nofloat.env4
-rw-r--r--heat/OpenECOMP/onap_openstack_nofloat.yaml2
7 files changed, 50 insertions, 7 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
diff --git a/heat/OpenECOMP/onap_openstack.env b/heat/OpenECOMP/onap_openstack.env
index c0fa56db..e049e7cb 100644
--- a/heat/OpenECOMP/onap_openstack.env
+++ b/heat/OpenECOMP/onap_openstack.env
@@ -50,6 +50,8 @@ parameters:
openstack_auth_method: password
+ openstack_region: RegionOne
+
horizon_url: PUT THE HORIZON URL HERE
keystone_url: PUT THE KEYSTONE URL HERE
@@ -103,8 +105,6 @@ parameters:
nexus_url_snapshot: https://nexus.onap.org/content/repositories/snapshots
- openstack_region: RegionOne
-
gitlab_branch: master
dcae_code_version: 1.0.0 \ No newline at end of file
diff --git a/heat/OpenECOMP/onap_openstack.yaml b/heat/OpenECOMP/onap_openstack.yaml
index 881472e1..88062ffe 100644
--- a/heat/OpenECOMP/onap_openstack.yaml
+++ b/heat/OpenECOMP/onap_openstack.yaml
@@ -486,6 +486,7 @@ resources:
__openstack_username__: { get_param: openstack_username }
__openstack_tenant_id__: { get_param: openstack_tenant_id }
__openstack_api_key__: { get_param: openstack_api_key }
+ __openstack_region__: { get_param: openstack_region }
__keystone_url__: { get_param: keystone_url }
__dmaap_topic__: { get_param: dmaap_topic }
__artifacts_version__: { get_param: artifacts_version }
@@ -509,6 +510,7 @@ resources:
echo "__openstack_username__" > /opt/config/openstack_username.txt
echo "__openstack_tenant_id__" > /opt/config/tenant_id.txt
echo "__openstack_api_key__" > /opt/config/openstack_api_key.txt
+ echo "__openstack_region__" > /opt/config/openstack_region.txt
echo "__keystone_url__" > /opt/config/keystone.txt
echo "__docker_version__" > /opt/config/docker_version.txt
echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
diff --git a/heat/OpenECOMP/onap_openstack_float.env b/heat/OpenECOMP/onap_openstack_float.env
index 06ba61af..ea243d6f 100644
--- a/heat/OpenECOMP/onap_openstack_float.env
+++ b/heat/OpenECOMP/onap_openstack_float.env
@@ -50,6 +50,8 @@ parameters:
openstack_auth_method: password
+ openstack_region: RegionOne
+
horizon_url: PUT THE HORIZON URL HERE
keystone_url: PUT THE KEYSTONE URL HERE
@@ -124,8 +126,6 @@ parameters:
nexus_url_snapshot: https://nexus.onap.org/content/repositories/snapshots
- openstack_region: RegionOne
-
gitlab_branch: master
dcae_code_version: 1.0.0 \ No newline at end of file
diff --git a/heat/OpenECOMP/onap_openstack_float.yaml b/heat/OpenECOMP/onap_openstack_float.yaml
index 0ffe093a..6bda4d2c 100644
--- a/heat/OpenECOMP/onap_openstack_float.yaml
+++ b/heat/OpenECOMP/onap_openstack_float.yaml
@@ -558,6 +558,7 @@ resources:
__openstack_username__: { get_param: openstack_username }
__openstack_tenant_id__: { get_param: openstack_tenant_id }
__openstack_api_key__: { get_param: openstack_api_key }
+ __openstack_region__: { get_param: openstack_region }
__keystone_url__: { get_param: keystone_url }
__dmaap_topic__: { get_param: dmaap_topic }
__artifacts_version__: { get_param: artifacts_version }
@@ -581,6 +582,7 @@ resources:
echo "__openstack_username__" > /opt/config/openstack_username.txt
echo "__openstack_tenant_id__" > /opt/config/tenant_id.txt
echo "__openstack_api_key__" > /opt/config/openstack_api_key.txt
+ echo "__openstack_region__" > /opt/config/openstack_region.txt
echo "__keystone_url__" > /opt/config/keystone.txt
echo "__docker_version__" > /opt/config/docker_version.txt
echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
diff --git a/heat/OpenECOMP/onap_openstack_nofloat.env b/heat/OpenECOMP/onap_openstack_nofloat.env
index 07fa7132..854c179d 100644
--- a/heat/OpenECOMP/onap_openstack_nofloat.env
+++ b/heat/OpenECOMP/onap_openstack_nofloat.env
@@ -50,6 +50,8 @@ parameters:
openstack_auth_method: password
+ openstack_region: RegionOne
+
horizon_url: PUT THE HORIZON URL HERE
keystone_url: PUT THE KEYSTONE URL HERE
@@ -101,8 +103,6 @@ parameters:
nexus_url_snapshot: https://nexus.onap.org/content/repositories/snapshots
- openstack_region: RegionOne
-
gitlab_branch: master
dcae_code_version: 1.0.0
diff --git a/heat/OpenECOMP/onap_openstack_nofloat.yaml b/heat/OpenECOMP/onap_openstack_nofloat.yaml
index 36b57ed9..307db1a2 100644
--- a/heat/OpenECOMP/onap_openstack_nofloat.yaml
+++ b/heat/OpenECOMP/onap_openstack_nofloat.yaml
@@ -458,6 +458,7 @@ resources:
__openstack_username__: { get_param: openstack_username }
__openstack_tenant_id__: { get_param: openstack_tenant_id }
__openstack_api_key__: { get_param: openstack_api_key }
+ __openstack_region__: { get_param: openstack_region }
__keystone_url__: { get_param: keystone_url }
__dmaap_topic__: { get_param: dmaap_topic }
__artifacts_version__: { get_param: artifacts_version }
@@ -485,6 +486,7 @@ resources:
echo "__openstack_username__" > /opt/config/openstack_username.txt
echo "__openstack_tenant_id__" > /opt/config/tenant_id.txt
echo "__openstack_api_key__" > /opt/config/openstack_api_key.txt
+ echo "__openstack_region__" > /opt/config/openstack_region.txt
echo "__keystone_url__" > /opt/config/keystone.txt
echo "__docker_version__" > /opt/config/docker_version.txt
echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt