summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Platania <platania@research.att.com>2017-03-29 10:52:06 -0400
committerMarco Platania <platania@research.att.com>2017-03-29 10:52:06 -0400
commitf6a51980bb61a2e70cb80b3fa33a0a7c93438f4f (patch)
treec5755cbe23698fa12fc32dc3984f2f2e7eb55417
parentfc7b4a5cfe3fac62abf682f17f0630f38b60f28b (diff)
update boot scripts
Change-Id: I16a8e485bcf34f7d3fd8c7e62da9b3baeb5c34bb Signed-off-by: Marco Platania <platania@research.att.com>
-rw-r--r--boot/appc_vm_init.sh5
-rw-r--r--boot/policy_vm_init.sh8
-rw-r--r--boot/portal_vm_init.sh4
-rw-r--r--boot/sdnc_vm_init.sh6
-rw-r--r--heat/OpenECOMP/.DS_Storebin6148 -> 0 bytes
-rw-r--r--heat/OpenECOMP/openecomp_rackspace.yaml53
6 files changed, 44 insertions, 32 deletions
diff --git a/boot/appc_vm_init.sh b/boot/appc_vm_init.sh
index 5a11aae7..33177f7f 100644
--- a/boot/appc_vm_init.sh
+++ b/boot/appc_vm_init.sh
@@ -15,10 +15,9 @@ sed -i "s/DMAAP_TOPIC_ENV=.*/DMAAP_TOPIC_ENV="$DMAAP_TOPIC"/g" docker-compose.ym
docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
docker pull $NEXUS_DOCKER_REPO/openecomp/appc-image:$DOCKER_IMAGE_VERSION
-docker tag $NEXUS_DOCKER_REPO/openecomp/appc-image:$DOCKER_IMAGE_VERSION latest
+docker tag $NEXUS_DOCKER_REPO/openecomp/appc-image:$DOCKER_IMAGE_VERSION openecomp/appc-image:latest
docker pull $NEXUS_DOCKER_REPO/openecomp/dgbuilder-sdnc-image:$DOCKER_IMAGE_VERSION
-docker tag $NEXUS_DOCKER_REPO/openecomp/dgbuilder-sdnc-image:$DOCKER_IMAGE_VERSION latest
+docker tag $NEXUS_DOCKER_REPO/openecomp/dgbuilder-sdnc-image:$DOCKER_IMAGE_VERSION openecomp/dgbuilder-sdnc-image:latest
-#/opt/docker/docker-compose pull
/opt/docker/docker-compose up -d
diff --git a/boot/policy_vm_init.sh b/boot/policy_vm_init.sh
index 0656dc9f..2514467c 100644
--- a/boot/policy_vm_init.sh
+++ b/boot/policy_vm_init.sh
@@ -24,15 +24,15 @@ echo $IP_ADDRESS > config/pe/ip_addr.txt
docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
docker pull $NEXUS_DOCKER_REPO/openecomp/policy/policy-db:$DOCKER_IMAGE_VERSION
-docker tag $NEXUS_DOCKER_REPO/openecomp/policy/policy-db:$DOCKER_IMAGE_VERSION latest
+docker tag $NEXUS_DOCKER_REPO/openecomp/policy/policy-db:$DOCKER_IMAGE_VERSION openecomp/policy/policy-db:latest
docker pull $NEXUS_DOCKER_REPO/openecomp/policy/policy-pe:$DOCKER_IMAGE_VERSION
-docker tag $NEXUS_DOCKER_REPO/openecomp/policy/policy-pe:$DOCKER_IMAGE_VERSION latest
+docker tag $NEXUS_DOCKER_REPO/openecomp/policy/policy-pe:$DOCKER_IMAGE_VERSION openecomp/policy/policy-pe:latest
docker pull $NEXUS_DOCKER_REPO/openecomp/policy/policy-drools:$DOCKER_IMAGE_VERSION
-docker tag $NEXUS_DOCKER_REPO/openecomp/policy/policy-drools:$DOCKER_IMAGE_VERSION latest
+docker tag $NEXUS_DOCKER_REPO/openecomp/policy/policy-drools:$DOCKER_IMAGE_VERSION openecomp/policy/policy-drools:latest
docker pull $NEXUS_DOCKER_REPO/openecomp/policy/policy-nexus:$DOCKER_IMAGE_VERSION
-docker tag $NEXUS_DOCKER_REPO/openecomp/policy/policy-nexus:$DOCKER_IMAGE_VERSION latest
+docker tag $NEXUS_DOCKER_REPO/openecomp/policy/policy-nexus:$DOCKER_IMAGE_VERSION openecomp/policy/policy-nexus:latest
/opt/docker/docker-compose up -d
diff --git a/boot/portal_vm_init.sh b/boot/portal_vm_init.sh
index b3f2d650..e7ecfe54 100644
--- a/boot/portal_vm_init.sh
+++ b/boot/portal_vm_init.sh
@@ -21,8 +21,8 @@ docker pull $NEXUS_DOCKER_REPO/openecomp/portalapps:$DOCKER_IMAGE_VERSION
docker create --name data_vol_portal -v /var/lib/mysql mariadb
-docker tag $NEXUS_DOCKER_REPO/openecomp/portaldb:latest ecompdb:portal
-docker tag $NEXUS_DOCKER_REPO/openecomp/portalapps:latest ep:1610-1
+docker tag $NEXUS_DOCKER_REPO/openecomp/portaldb:$DOCKER_IMAGE_VERSION ecompdb:portal
+docker tag $NEXUS_DOCKER_REPO/openecomp/portalapps:$DOCKER_IMAGE_VERSION ep:1610-1
docker rm -f ecompdb_portal
docker rm -f 1610-1
diff --git a/boot/sdnc_vm_init.sh b/boot/sdnc_vm_init.sh
index 428819b7..0caaa03b 100644
--- a/boot/sdnc_vm_init.sh
+++ b/boot/sdnc_vm_init.sh
@@ -12,12 +12,12 @@ cd /opt/sdnc/installation/src/main/yaml
docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
docker pull $NEXUS_DOCKER_REPO/openecomp/sdnc-image:$DOCKER_IMAGE_VERSION
-docker tag $NEXUS_DOCKER_REPO/openecomp/sdnc-image:$DOCKER_IMAGE_VERSION latest
+docker tag $NEXUS_DOCKER_REPO/openecomp/sdnc-image:$DOCKER_IMAGE_VERSION openecomp/sdnc-image:latest
docker pull $NEXUS_DOCKER_REPO/openecomp/admportal-sdnc-image:$DOCKER_IMAGE_VERSION
-docker tag $NEXUS_DOCKER_REPO/openecomp/admportal-sdnc-image:$DOCKER_IMAGE_VERSION latest
+docker tag $NEXUS_DOCKER_REPO/openecomp/admportal-sdnc-image:$DOCKER_IMAGE_VERSION openecomp/admportal-sdnc-image:latest
docker pull $NEXUS_DOCKER_REPO/openecomp/dgbuilder-sdnc-image:$DOCKER_IMAGE_VERSION
-docker tag $NEXUS_DOCKER_REPO/openecomp/dgbuilder-sdnc-image:$DOCKER_IMAGE_VERSION latest
+docker tag $NEXUS_DOCKER_REPO/openecomp/dgbuilder-sdnc-image:$DOCKER_IMAGE_VERSION openecomp/dgbuilder-sdnc-image:latest
/opt/docker/docker-compose up -d
diff --git a/heat/OpenECOMP/.DS_Store b/heat/OpenECOMP/.DS_Store
deleted file mode 100644
index 5008ddfc..00000000
--- a/heat/OpenECOMP/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/heat/OpenECOMP/openecomp_rackspace.yaml b/heat/OpenECOMP/openecomp_rackspace.yaml
index e716c6d2..8a30bbc0 100644
--- a/heat/OpenECOMP/openecomp_rackspace.yaml
+++ b/heat/OpenECOMP/openecomp_rackspace.yaml
@@ -1,10 +1,10 @@
heat_template_version: 2013-05-23
-description: Heat template to deploy OpenECOMP components
+description: Heat template to deploy ONAP components
parameters:
- # Generic parameters used across all OpenECOMP components
+ # Generic parameters used across all ONAP components
public_net_id:
type: string
label: Public network name or ID
@@ -58,13 +58,17 @@ parameters:
artifacts_version:
type: string
label: Artifacts Version
- description: Artifacts version of OpenECOMP components
+ description: Artifacts version of ONAP components
docker_version:
type: string
label: Docker Version
- description: Docker version of OpenECOMP docker images
+ description: Docker version of ONAP docker images
+ gerrit_branch:
+ type: string
+ label: Gerrit code branch
+ description: Gerrit branch where to download the code from
# Parameters for DCAE instantiation
dcae_zone:
@@ -124,7 +128,7 @@ resources:
properties:
length: 4
- # Public key used to access OpenECOMP components
+ # Public key used to access ONAP components
vm_key:
type: OS::Nova::KeyPair
properties:
@@ -138,7 +142,7 @@ resources:
save_private_key: false
- # OpenECOMP management private network
+ # ONAP management private network
oam_ecomp:
type: OS::Neutron::Net
properties:
@@ -158,7 +162,6 @@ resources:
rand: { get_resource: random-str }
network_id: { get_resource: oam_ecomp }
cidr: 10.0.0.0/8
- value: { get_attr: [oam_ecomp, name] }
# DNS Server instantiation
@@ -288,7 +291,7 @@ resources:
echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt
echo "__gitlab_username__" > /opt/config/gitlab_username.txt
echo "__gitlab_password__" > /opt/config/gitlab_password.txt
- echo "gerrit.openecomp.org" > /opt/config/gitlab_certname.txt
+ echo "gerrit.onap.org" > /opt/config/gitlab_certname.txt
echo "__docker_version__" > /opt/config/docker_version.txt
# Execute docker instructions
@@ -329,6 +332,7 @@ resources:
__dmaap_topic__: { get_param: dmaap_topic }
__artifacts_version__: { get_param: artifacts_version }
__docker_version__: { get_param: docker_version }
+ __gerrit_branch__: { get_param: gerrit_branch }
template: |
#!/bin/bash
@@ -375,7 +379,7 @@ resources:
# Run docker-compose to spin up containers
cd /opt
- git clone https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/mso/docker-config.git test_lab
+ git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.onap.org/r/a/mso/docker-config.git test_lab
MSO_ENCRYPTION_KEY=$(cat /opt/test_lab/encryption.key)
echo -n "__openstack_api_key__" | openssl aes-128-ecb -e -K $MSO_ENCRYPTION_KEY -nosalt | xxd -c 256 -p > /opt/config/api_key.txt
./mso_vm_init.sh
@@ -409,6 +413,7 @@ resources:
__gitlab_username__: { get_param: gitlab_username }
__gitlab_password__: { get_param: gitlab_password }
__artifacts_version__: { get_param: artifacts_version }
+ __gerrit_branch__: { get_param: gerrit_branch }
template: |
#!/bin/bash
@@ -451,7 +456,7 @@ resources:
# Run docker-compose to spin up containers
cd /opt
- git clone https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/dcae/demo/startup/message-router.git dcae-startup-vm-message-router
+ git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.onap.org/r/a/dcae/demo/startup/message-router.git dcae-startup-vm-message-router
./mr_vm_init.sh
@@ -489,6 +494,7 @@ resources:
__artifacts_version__: { get_param: artifacts_version }
__openstack_region__: { get_param: openstack_region }
__docker_version__: { get_param: docker_version }
+ __gerrit_branch__: { get_param: gerrit_branch }
template: |
#!/bin/bash
@@ -544,7 +550,7 @@ resources:
# Run docker-compose to spin up containers
cd /opt
- git clone https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/testsuite/properties.git testsuite/properties
+ git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.onap.org/r/a/testsuite/properties.git testsuite/properties
./robot_vm_init.sh
@@ -577,6 +583,7 @@ resources:
__gitlab_password__: { get_param: gitlab_password }
__artifacts_version__: { get_param: artifacts_version }
__docker_version__: { get_param: docker_version }
+ __gerrit_branch__: { get_param: gerrit_branch }
template: |
#!/bin/bash
@@ -620,7 +627,7 @@ resources:
# Run script to spin up containers
cd /opt
- git clone https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/vid.git
+ git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.onap.org/r/a/vid.git
./vid_vm_init.sh
@@ -653,6 +660,7 @@ resources:
__gitlab_password__: { get_param: gitlab_password }
__artifacts_version__: { get_param: artifacts_version }
__docker_version__: { get_param: docker_version }
+ __gerrit_branch__: { get_param: gerrit_branch }
template: |
#!/bin/bash
@@ -698,7 +706,7 @@ resources:
# Run docker-compose to spin up containers
cd /opt
- git clone https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/sdnc/oam.git sdnc
+ git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.onap.org/r/a/sdnc/oam.git sdnc
./sdnc_vm_init.sh
@@ -756,6 +764,7 @@ resources:
__env_name__: { get_param: dmaap_topic }
__artifacts_version__: { get_param: artifacts_version }
__docker_version__: { get_param: docker_version }
+ __gerrit_branch__: { get_param: gerrit_branch }
template: |
#!/bin/bash
@@ -818,7 +827,7 @@ resources:
chmod 777 /data/logs/BE
chmod 777 /data/logs/FE
- git clone https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/sdc.git
+ git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.onap.org/r/a/sdc.git
cat > /root/.bash_aliases << EOF
alias dcls='/data/scripts/docker_clean.sh \$1'
@@ -870,6 +879,7 @@ resources:
__gitlab_password__: { get_param: gitlab_password }
__artifacts_version__: { get_param: artifacts_version }
__docker_version__: { get_param: docker_version }
+ __gerrit_branch__: { get_param: gerrit_branch }
template: |
#!/bin/bash
@@ -915,7 +925,7 @@ resources:
# Run Portal-specific instructions
mkdir -p /PROJECT/OpenSource/UbuntuEP/logs
cd /opt
- git clone https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/portal.git
+ git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.onap.org/r/a/portal.git
# Run docker-compose to spin up containers
./portal_vm_init.sh
@@ -962,6 +972,7 @@ resources:
__nexus_repo_root__: { get_param: nexus_repo_root }
__openstack_region__: { get_param: openstack_region }
__docker_version__: { get_param: docker_version }
+ __gerrit_branch__: { get_param: gerrit_branch }
template: |
#!/bin/bash
@@ -995,14 +1006,14 @@ resources:
# DCAE Controller specific deployment
cd /opt
- git clone https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/dcae/demo/startup/controller.git dcae-startup-vm-controller
+ git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.onap.org/r/a/dcae/demo/startup/controller.git dcae-startup-vm-controller
cd dcae-startup-vm-controller
mkdir -p /opt/app/dcae-controller
cat > /opt/app/dcae-controller/config.yaml << EOF_CONFIG
ZONE: __dcae_zone__
STATE: __dcae_state__
- DCAE-VERSION: 1.0.0
+ DCAE-VERSION: __artifacts_version__
HORIZON-URL: https://mycloud.rackspace.com/cloud/__tenant_id__
KEYSTONE-URL: https://identity.api.rackspacecloud.com/v2.0
OPENSTACK-TENANT-ID: __tenant_id__
@@ -1022,7 +1033,7 @@ resources:
DOCKER-REGISTRY: __nexus_docker_repo__
- GIT-MR-REPO: https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/dcae/demo/startup/message-router.git
+ GIT-MR-REPO: https://__gitlab_username__:__gitlab_password__@gerrit.onap.org/r/a/dcae/demo/startup/message-router.git
EOF_CONFIG
# Store credentials in files
@@ -1078,6 +1089,7 @@ resources:
__gitlab_password__: { get_param: gitlab_password }
__artifacts_version__: { get_param: artifacts_version }
__docker_version__: { get_param: docker_version }
+ __gerrit_branch__: { get_param: gerrit_branch }
template: |
#!/bin/bash
@@ -1122,7 +1134,7 @@ resources:
# Run docker-compose to spin up containers
cd /opt
- git clone https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/policy/docker.git policy
+ git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.onap.org/r/a/policy/docker.git policy
./policy_vm_init.sh
@@ -1157,6 +1169,7 @@ resources:
__dmaap_topic__: { get_param: dmaap_topic }
__artifacts_version__: { get_param: artifacts_version }
__docker_version__: { get_param: docker_version }
+ __gerrit_branch__: { get_param: gerrit_branch }
template: |
#!/bin/bash
@@ -1203,6 +1216,6 @@ resources:
# Run docker-compose to spin up containers
cd /opt
- git clone https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/appc/deployment.git appc
+ git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.onap.org/r/a/appc/deployment.git appc
./appc_vm_init.sh