diff options
| -rw-r--r-- | .DS_Store | bin | 6148 -> 8196 bytes | |||
| -rw-r--r-- | boot/aaf_serv.sh | 98 | ||||
| -rw-r--r-- | boot/aaf_vm_init.sh | 4 | ||||
| -rw-r--r-- | boot/aai_vm_init.sh | 12 | ||||
| -rw-r--r-- | boot/appc_vm_init.sh | 4 | ||||
| -rw-r--r-- | boot/asdc_vm_init.sh | 17 | ||||
| -rw-r--r-- | boot/db_simpledemo_openecomp_org | 110 | ||||
| -rw-r--r-- | boot/dcae_vm_init.sh | 19 | ||||
| -rw-r--r-- | boot/mr_vm_init.sh | 19 | ||||
| -rw-r--r-- | boot/mso_vm_init.sh | 5 | ||||
| -rw-r--r-- | boot/named.conf.local | 4 | ||||
| -rw-r--r-- | boot/named.conf.options | 4 | ||||
| -rw-r--r-- | boot/policy_vm_init.sh | 7 | ||||
| -rw-r--r-- | boot/portal_vm_init.sh | 18 | ||||
| -rw-r--r-- | boot/sdnc_vm_init.sh | 3 | ||||
| -rw-r--r-- | boot/vid_vm_init.sh | 10 |
16 files changed, 175 insertions, 159 deletions
| Binary files differ diff --git a/boot/aaf_serv.sh b/boot/aaf_serv.sh deleted file mode 100644 index 73d22ad3..00000000 --- a/boot/aaf_serv.sh +++ /dev/null @@ -1,98 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: -# Required-Start: $remote_fs $syslog -# Required-Stop: $remote_fs $syslog -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Start daemon at boot time -# Description: Enable service provided by daemon. -### END INIT INFO - -dir="/opt" -cmd="./aaf_vm_init.sh" -user="root" - -name=`basename $0` -pid_file="/var/run/$name.pid" -stdout_log="/var/log/$name.log" -stderr_log="/var/log/$name.err" - -get_pid() { - cat "$pid_file" -} - -is_running() { - [ -f "$pid_file" ] && ps `get_pid` > /dev/null 2>&1 -} - -case "$1" in - start) - if is_running; then - echo "Already started" - else - echo "Starting $name" - cd "$dir" - if [ -z "$user" ]; then - sudo $cmd >> "$stdout_log" 2>> "$stderr_log" & - else - sudo -u "$user" $cmd >> "$stdout_log" 2>> "$stderr_log" & - fi - echo $! > "$pid_file" - if ! is_running; then - echo "Unable to start, see $stdout_log and $stderr_log" - exit 1 - fi - fi - ;; - stop) - if is_running; then - echo -n "Stopping $name.." - kill `get_pid` - for i in {1..10} - do - if ! is_running; then - break - fi - - echo -n "." - sleep 1 - done - echo - - if is_running; then - echo "Not stopped; may still be shutting down or shutdown may have failed" - exit 1 - else - echo "Stopped" - if [ -f "$pid_file" ]; then - rm "$pid_file" - fi - fi - else - echo "Not running" - fi - ;; - restart) - $0 stop - if is_running; then - echo "Unable to stop, will not attempt to start" - exit 1 - fi - $0 start - ;; - status) - if is_running; then - echo "Running" - else - echo "Stopped" - exit 1 - fi - ;; - *) - echo "Usage: $0 {start|stop|restart|status}" - exit 1 - ;; -esac - -exit 0 diff --git a/boot/aaf_vm_init.sh b/boot/aaf_vm_init.sh deleted file mode 100644 index 1f29429c..00000000 --- a/boot/aaf_vm_init.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -cd dcae-startup-vm-aaf -./deploy.sh diff --git a/boot/aai_vm_init.sh b/boot/aai_vm_init.sh index 148fc583..4ad0b8e3 100644 --- a/boot/aai_vm_init.sh +++ b/boot/aai_vm_init.sh @@ -10,19 +10,19 @@ GITLAB_PASSWD=$(cat /opt/config/gitlab_password.txt) docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO -docker pull $NEXUS_DOCKER_REPO/ecomp/aai-hbase-1.2.3 +docker pull $NEXUS_DOCKER_REPO/openecomp/aai-hbase-1.2.3 docker rm -f hbase-1.2.3 -docker run -d --net=host --name="hbase-1.2.3" $NEXUS_DOCKER_REPO/ecomp/aai-hbase-1.2.3 +docker run -d --net=host --name="hbase-1.2.3" $NEXUS_DOCKER_REPO/openecomp/aai-hbase-1.2.3 # Wait 3 minutes before instantiating the A&AI container sleep 180 -docker pull $NEXUS_DOCKER_REPO/ecomp/ajsc-aai:latest +docker pull $NEXUS_DOCKER_REPO/openecomp/ajsc-aai:latest docker rm -f aai-service -docker run --name=aai-service --net=host -v /etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt -it -e GITLAB_CERTNAME=$GITLAB_CERTNAME -e GITLAB_USERNAME=$GITLAB_USERNAME -e GITLAB_PASSWORD=$GITLAB_PASSWD -e AAI_REPO_PATH=OpenECOMP -e AAI_CHEF_ENV=simpledemo -d -e AAI_CHEF_LOC=/var/chef/aai-data/environments -e docker_gitbranch=develop $NEXUS_DOCKER_REPO/ecomp/ajsc-aai:latest +docker run --name=aai-service --net=host -v /etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt -it -e GITLAB_CERTNAME=$GITLAB_CERTNAME -e GITLAB_USERNAME=$GITLAB_USERNAME -e GITLAB_PASSWORD=$GITLAB_PASSWD -e AAI_REPO_PATH=r/aai -e AAI_CHEF_ENV=simpledemo -d -e AAI_CHEF_LOC=/var/chef/aai-data/environments -e docker_gitbranch=develop $NEXUS_DOCKER_REPO/openecomp/ajsc-aai:latest -docker pull $NEXUS_DOCKER_REPO/ecomp/model-loader:latest +docker pull $NEXUS_DOCKER_REPO/openecomp/model-loader:latest docker rm -f model-loader-service -docker run --name=model-loader-service -it -d -e DISTR_CLIENT_ASDC_ADDRESS=c2.vm1.asdc.simpledemo.openecomp.org:8443 -e DISTR_CLIENT_ENVIRONMENT_NAME=$DMAAP_TOPIC -e DISTR_CLIENT_USER=aai -e DISTR_CLIENT_PASSWORD=OBF:1ks51l8d1o3i1pcc1r2r1e211r391kls1pyj1z7u1njf1lx51go21hnj1y0k1mli1sop1k8o1j651vu91mxw1vun1mze1vv11j8x1k5i1sp11mjc1y161hlr1gm41m111nkj1z781pw31kku1r4p1e391r571pbm1o741l4x1ksp -e APP_SERVER_BASE_URL=https://c1.vm1.aai.simpledemo.openecomp.org:8443 -e APP_SERVER_KEYSTORE_PASSWORD=OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o -e APP_SERVER_AUTH_USER=ModelLoader -e APP_SERVER_AUTH_PASSWORD=OBF:1qvu1v2h1sov1sar1wfw1j7j1wg21saj1sov1v1x1qxw $NEXUS_DOCKER_REPO/ecomp/model-loader:latest +docker run --name=model-loader-service -it -d -e DISTR_CLIENT_ASDC_ADDRESS=c2.vm1.asdc.simpledemo.openecomp.org:8443 -e DISTR_CLIENT_ENVIRONMENT_NAME=$DMAAP_TOPIC -e DISTR_CLIENT_USER=aai -e DISTR_CLIENT_PASSWORD=OBF:1ks51l8d1o3i1pcc1r2r1e211r391kls1pyj1z7u1njf1lx51go21hnj1y0k1mli1sop1k8o1j651vu91mxw1vun1mze1vv11j8x1k5i1sp11mjc1y161hlr1gm41m111nkj1z781pw31kku1r4p1e391r571pbm1o741l4x1ksp -e APP_SERVER_BASE_URL=https://c1.vm1.aai.simpledemo.openecomp.org:8443 -e APP_SERVER_KEYSTORE_PASSWORD=OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o -e APP_SERVER_AUTH_USER=ModelLoader -e APP_SERVER_AUTH_PASSWORD=OBF:1qvu1v2h1sov1sar1wfw1j7j1wg21saj1sov1v1x1qxw $NEXUS_DOCKER_REPO/openecomp/model-loader:latest diff --git a/boot/appc_vm_init.sh b/boot/appc_vm_init.sh index 1692a074..bbcf7128 100644 --- a/boot/appc_vm_init.sh +++ b/boot/appc_vm_init.sh @@ -6,8 +6,10 @@ NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt) DMAAP_TOPIC=$(cat /opt/config/dmaap_topic.txt) cd /opt/appc +git pull +cd /opt/appc/docker-compose -sed -i "s/DMAAP_TOPIC_ENV=.*/DMAAP_TOPIC_ENV="$DMAAP_TOPIC"/g" /opt/appc/docker-compose.yml +sed -i "s/DMAAP_TOPIC_ENV=.*/DMAAP_TOPIC_ENV="$DMAAP_TOPIC"/g" docker-compose.yml docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO /opt/docker/docker-compose pull diff --git a/boot/asdc_vm_init.sh b/boot/asdc_vm_init.sh index f0777d5f..5a31c1ca 100644 --- a/boot/asdc_vm_init.sh +++ b/boot/asdc_vm_init.sh @@ -4,6 +4,21 @@ NEXUS_USERNAME=$(cat /opt/config/nexus_username.txt) NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt) NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt) ENV_NAME=$(cat /opt/config/env_name.txt) +RELEASE=latest + +cd /opt/sdc +git pull + +cd /opt +cp sdc/sdc-os-chef/environments/Template.json /data/environments +cp sdc/sdc-os-chef/scripts/docker_run.sh /data/scripts +cp sdc/sdc-os-chef/scripts/docker_health.sh /data/scripts +chmod +x /data/scripts/docker_run.sh +chmod +x /data/scripts/docker_health.sh + +IP_ADDRESS=$(ifconfig eth0 | grep "inet addr" | tr -s ' ' | cut -d' ' -f3 | cut -d':' -f2) +cat /data/environments/Template.json | sed "s/yyy/"$IP_ADDRESS"/g" > /data/environments/$ENV_NAME.json +sed -i "s/xxx/"$ENV_NAME"/g" /data/environments/$ENV_NAME.json docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO -bash /data/scripts/docker_run.sh -e $ENV_NAME +bash /data/scripts/docker_run.sh -e $ENV_NAME -r $RELEASE -p 10001 diff --git a/boot/db_simpledemo_openecomp_org b/boot/db_simpledemo_openecomp_org new file mode 100644 index 00000000..1cb3d9c7 --- /dev/null +++ b/boot/db_simpledemo_openecomp_org @@ -0,0 +1,110 @@ +; +; BIND data file for local loopback interface +; +$TTL 604800 +@ IN SOA simpledemo.openecomp.org. admin.simpledemo.openecomp.org. ( + 20170221 ; Serial + 604800 ; Refresh + 86400 ; Retry + 2419200 ; Expire + 604800 ) ; Negative Cache TTL +; +; name servers - NS records + IN NS simpledemo.openecomp.org. + +; name servers - A records +simpledemo.openecomp.org. IN A 10.0.0.1 + +; +vm1.aai.simpledemo.openecomp.org. IN A 10.0.1.1 +c1.vm1.aai.simpledemo.openecomp.org. IN A 10.0.1.1 +c2.vm1.aai.simpledemo.openecomp.org. IN A 10.0.1.1 +c3.vm1.aai.simpledemo.openecomp.org. IN A 10.0.1.1 + +vm1.appc.simpledemo.openecomp.org. IN A 10.0.2.1 +c1.vm1.appc.simpledemo.openecomp.org. IN A 10.0.2.1 +c2.vm1.appc.simpledemo.openecomp.org. IN A 10.0.2.1 + +vm1.asdc.simpledemo.openecomp.org. IN A 10.0.3.1 +c1.vm1.asdc.simpledemo.openecomp.org. IN A 10.0.3.1 +c2.vm1.asdc.simpledemo.openecomp.org. IN A 10.0.3.1 +c3.vm1.asdc.simpledemo.openecomp.org. IN A 10.0.3.1 +c4.vm1.asdc.simpledemo.openecomp.org. IN A 10.0.3.1 + +vm1.dcae.simpledemo.openecomp.org. IN A 10.0.4.1 +c1.vm1.dcae.simpledemo.openecomp.org. IN A 10.0.4.1 +c2.vm1.dcae.simpledemo.openecomp.org. IN A 10.0.4.1 +c3.vm1.dcae.simpledemo.openecomp.org IN A 10.0.4.1 + +vm1.mso.simpledemo.openecomp.org. IN A 10.0.5.1 +c1.vm1.mso.simpledemo.openecomp.org. IN A 10.0.5.1 +c1.vm1.mso.simpledemo.openecomp.org. IN A 10.0.5.1 + +vm1.policy.simpledemo.openecomp.org. IN A 10.0.6.1 +c1.vm1.policy.simpledemo.openecomp.org. IN A 10.0.6.1 +c2.vm1.policy.simpledemo.openecomp.org. IN A 10.0.6.1 +c3.vm1.policy.simpledemo.openecomp.org. IN A 10.0.6.1 +c4.vm1.policy.simpledemo.openecomp.org. IN A 10.0.6.1 +c5.vm1.policy.simpledemo.openecomp.org. IN A 10.0.6.1 +c6.vm1.policy.simpledemo.openecomp.org. IN A 10.0.6.1 +c7.vm1.policy.simpledemo.openecomp.org. IN A 10.0.6.1 +c8.vm1.policy.simpledemo.openecomp.org. IN A 10.0.6.1 + +vm1.sdnc.simpledemo.openecomp.org. IN A 10.0.7.1 +c1.vm1.sdnc.simpledemo.openecomp.org. IN A 10.0.7.1 +c2.vm1.sdnc.simpledemo.openecomp.org. IN A 10.0.7.1 +c3.vm1.sdnc.simpledemo.openecomp.org. IN A 10.0.7.1 +c4.vm1.sdnc.simpledemo.openecomp.org. IN A 10.0.7.1 + +vm1.vid.simpledemo.openecomp.org. IN A 10.0.8.1 +c1.vm1.vid.simpledemo.openecomp.org. IN A 10.0.8.1 +c2.vm1.vid.simpledemo.openecomp.org. IN A 10.0.8.1 + +vm1.portal.simpledemo.openecomp.org. IN A 10.0.9.1 +c1.vm1.portal.simpledemo.openecomp.org. IN A 10.0.9.1 +c2.vm1.portal.simpledemo.openecomp.org. IN A 10.0.9.1 + +vm1.aaf.simpledemo.openecomp.org. IN A 10.0.12.1 + +vm1.mr.simpledemo.openecomp.org. IN A 10.0.11.1 + + +;CNAMES +;A&AI +aai.api.simpledemo.openecomp.org. IN CNAME vm1.aai.simpledemo.openecomp.org. +aai.hbase.simpledemo.openecomp.org. IN CNAME vm1.aai.simpledemo.openecomp.org. + +;APPC +appc.api.simpledemo.openecomp.org. IN CNAME vm1.appc.simpledemo.openecomp.org. + +;ASDC +asdc.api.simpledemo.openecomp.org. IN CNAME vm1.asdc.simpledemo.openecomp.org. + +;DCAE +dcae.api.simpledemo.openecomp.org. IN CNAME vm1.dcae.simpledemo.openecomp.org. + +;MSO +mso.api.simpledemo.openecomp.org. IN CNAME vm1.mso.simpledemo.openecomp.org. + +;Policy +policy.api.simpledemo.openecomp.org. IN CNAME vm1.policy.simpledemo.openecomp.org. + +;SDNC +sdnc.api.simpledemo.openecomp.org. IN CNAME vm1.sdnc.simpledemo.openecomp.org. + +;VID +vid.api.simpledemo.openecomp.org. IN CNAME vm1.vid.simpledemo.openecomp.org. + +;PORTAL +portal.api.simpledemo.openecomp.org. IN CNAME vm1.portal.simpledemo.openecomp.org. + +;Message Router +;mr.api.simpledemo.openecomp.org. IN CNAME vm1.mr.simpledemo.openecomp.org. +ueb.api.simpledemo.openecomp.org. IN CNAME vm1.mr.simpledemo.openecomp.org. +mr.api.simpledemo.openecomp.org. IN A 10.0.4.102 +collector.api.simpledemo.openecomp.org. IN A 10.0.4.102 +;dbc.api.simpledemo.openecomp.org. IN CNAME vm1.mr.simpledemo.openecomp.org. +;drprov.api.simpledemo.openecomp.org. IN CNAME vm1.mr.simpledemo.openecomp.org. + +;AAF +aaf.api.simpledemo.openecomp.org. IN CNAME vm1.aaf.simpledemo.openecomp.org. diff --git a/boot/dcae_vm_init.sh b/boot/dcae_vm_init.sh index 1802ed4e..538e7313 100644 --- a/boot/dcae_vm_init.sh +++ b/boot/dcae_vm_init.sh @@ -1,23 +1,6 @@ - -############################################################################# -# -# Copyright © 2017 AT&T Intellectual Property. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -############################################################################# - #!/bin/bash cd /opt/dcae-startup-vm-controller +git pull bash init.sh make up diff --git a/boot/mr_vm_init.sh b/boot/mr_vm_init.sh index 4cd6caf0..4e0ae6fb 100644 --- a/boot/mr_vm_init.sh +++ b/boot/mr_vm_init.sh @@ -1,22 +1,5 @@ - -############################################################################# -# -# Copyright © 2017 AT&T Intellectual Property. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -############################################################################# - #!/bin/bash cd /opt/dcae-startup-vm-message-router +git pull bash deploy.sh diff --git a/boot/mso_vm_init.sh b/boot/mso_vm_init.sh index f878f535..1f89a4ef 100644 --- a/boot/mso_vm_init.sh +++ b/boot/mso_vm_init.sh @@ -6,7 +6,7 @@ NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt) OPENSTACK_USERNAME=$(cat /opt/config/openstack_username.txt) OPENSTACK_APIKEY=$(cat /opt/config/api_key.txt) DMAAP_TOPIC=$(cat /opt/config/dmaap_topic.txt) -export MSO_DOCKER_IMAGE_VERSION=1.0.0 +export MSO_DOCKER_IMAGE_VERSION=latest # Update the MSO configuration file. read -d '' MSO_CONFIG_UPDATES <<-EOF @@ -45,6 +45,7 @@ export MSO_CONFIG_UPDATES # Deploy the environment cd /opt/test_lab +git pull chmod +x deploy.sh #This script takes in input 2 nexus repos (the first one for the MSO image, the second one for mariadb) -./deploy.sh $NEXUS_DOCKER_REPO $NEXUS_USERNAME $NEXUS_PASSWD ecomp-nexus:51211 release sfWU3DFVdBr7GVxB85mTYgAW +./deploy.sh $NEXUS_DOCKER_REPO $NEXUS_USERNAME $NEXUS_PASSWD $NEXUS_DOCKER_REPO $NEXUS_USERNAME $NEXUS_PASSWD diff --git a/boot/named.conf.local b/boot/named.conf.local index 3cc9f0d3..c7c82f3b 100644 --- a/boot/named.conf.local +++ b/boot/named.conf.local @@ -6,7 +6,7 @@ // organization //include "/etc/bind/zones.rfc1918"; -zone "openecomp.org" { +zone "simpledemo.openecomp.org" { type master; - file "/etc/bind/zones/db.openecomp.org"; # zone file path + file "/etc/bind/zones/db.simpledemo.openecomp.org"; # zone file path }; diff --git a/boot/named.conf.options b/boot/named.conf.options index 2b23f7e7..a09931cb 100644 --- a/boot/named.conf.options +++ b/boot/named.conf.options @@ -4,8 +4,8 @@ acl "trusted" { options { directory "/var/cache/bind"; - #recursion no; # enables recursive queries - #allow-recursion { trusted; }; # allows recursive queries from "trusted” clients i.e. LB only + recursion yes; # enables recursive queries + allow-recursion { 10.0/16; }; # allows recursive queries from "trusted” clients i.e. LB only listen-on { 10.0.0.1; }; # ns1 IP address - listen on this address only allow-transfer { none; }; # disable zone transfers by default diff --git a/boot/policy_vm_init.sh b/boot/policy_vm_init.sh index ad71cf0e..af4638c9 100644 --- a/boot/policy_vm_init.sh +++ b/boot/policy_vm_init.sh @@ -5,5 +5,12 @@ NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt) NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt) cd /opt/policy +git pull +cd /opt + +chmod +x policy/config/drools/drools-tweaks.sh +IP_ADDRESS=$(ifconfig eth0 | grep "inet addr" | tr -s ' ' | cut -d' ' -f3 | cut -d':' -f2) +echo $IP_ADDRESS > /opt/policy/config/pe/ip_addr.txt + docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO /opt/docker/docker-compose up -d diff --git a/boot/portal_vm_init.sh b/boot/portal_vm_init.sh index 744c4fc9..f15999ec 100644 --- a/boot/portal_vm_init.sh +++ b/boot/portal_vm_init.sh @@ -4,18 +4,28 @@ NEXUS_USERNAME=$(cat /opt/config/nexus_username.txt) NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt) NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt) +cd /opt/portal +git pull +cd /opt + +chmod +x portal/deliveries/new_start.sh +chmod +x portal/deliveries/new_stop.sh +chmod +x portal/deliveries/dbstart.sh +unzip -o portal/deliveries/etc.zip -d /PROJECT/OpenSource/UbuntuEP/ + docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO -docker pull $NEXUS_DOCKER_REPO/ecomp/portaldb:1610.3 -docker pull $NEXUS_DOCKER_REPO/ecomp/portalapps:1610.3 +docker pull $NEXUS_DOCKER_REPO/openecomp/portaldb:1.0.0 +docker pull $NEXUS_DOCKER_REPO/openecomp/portalapps:1.0.0 docker create --name data_vol_portal -v /var/lib/mysql mariadb -docker tag 6ce6ea8c6e52 ecompdb:portal -docker tag 925a8a953d4c ep:1610-1 +docker tag $NEXUS_DOCKER_REPO/openecomp/portaldb:1.0.0 ecompdb:portal +docker tag $NEXUS_DOCKER_REPO/openecomp/portalapps:1.0.0 ep:1610-1 docker rm -f ecompdb_portal docker rm -f 1610-1 +cd portal/deliveries ./dbstart.sh ./new_start.sh diff --git a/boot/sdnc_vm_init.sh b/boot/sdnc_vm_init.sh index a642a530..353ae6f3 100644 --- a/boot/sdnc_vm_init.sh +++ b/boot/sdnc_vm_init.sh @@ -5,5 +5,8 @@ NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt) NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt) cd /opt/sdnc +git pull + +cd /opt/sdnc/installation/src/main/yaml docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO /opt/docker/docker-compose up -d diff --git a/boot/vid_vm_init.sh b/boot/vid_vm_init.sh index fa019760..6a39c9c0 100644 --- a/boot/vid_vm_init.sh +++ b/boot/vid_vm_init.sh @@ -4,12 +4,16 @@ NEXUS_USERNAME=$(cat /opt/config/nexus_username.txt) NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt) NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt) +cd /opt/vid +git pull +cd /opt + docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO -docker pull $NEXUS_DOCKER_REPO/ecomp/vid:1.0.0 +docker pull $NEXUS_DOCKER_REPO/openecomp/vid:1.0.0 docker rm -f vid-mariadb docker rm -f vid-server -docker run --name vid-mariadb -e MYSQL_DATABASE=vid_openecomp -e MYSQL_USER=vidadmin -e MYSQL_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U -e MYSQL_ROOT_PASSWORD=LF+tp_1WqgSY -v /opt/vid-my.cnf:/etc/mysql/my.cnf -v /opt/vid-pre-init.sql:/docker-entrypoint-initdb.d/vid-pre-init.sql -v /var/lib/mysql -d mariadb:10 +docker run --name vid-mariadb -e MYSQL_DATABASE=vid_openecomp -e MYSQL_USER=vidadmin -e MYSQL_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U -e MYSQL_ROOT_PASSWORD=LF+tp_1WqgSY -v /opt/vid/lf_config/vid-my.cnf:/etc/mysql/my.cnf -v /opt/vid/lf_config/vid-pre-init.sql:/docker-entrypoint-initdb.d/vid-pre-init.sql -v /var/lib/mysql -d mariadb:10 -docker run -e VID_MYSQL_DBNAME=vid_openecomp -e VID_MYSQL_PASS=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U --name vid-server -p 8080:8080 --link vid-mariadb:vid-mariadb-docker-instance -d $NEXUS_DOCKER_REPO/ecomp/vid:1.0.0 +docker run -e VID_MYSQL_DBNAME=vid_openecomp -e VID_MYSQL_PASS=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U --name vid-server -p 8080:8080 --link vid-mariadb:vid-mariadb-docker-instance -d $NEXUS_DOCKER_REPO/openecomp/vid:1.0.0 |