From b22c5188b5979d4952010393eb2c51ada2905c27 Mon Sep 17 00:00:00 2001 From: platania Date: Thu, 23 Feb 2017 12:21:02 -0500 Subject: update boot scripts Change-Id: If96e0eb4130d1730aba0ef53901705fa7a17d64f Signed-off-by: platania --- boot/aai_vm_init.sh | 4 ++-- boot/asdc_vm_init.sh | 2 ++ boot/policy_vm_init.sh | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/boot/aai_vm_init.sh b/boot/aai_vm_init.sh index 92b7e580..7a92fc4c 100644 --- a/boot/aai_vm_init.sh +++ b/boot/aai_vm_init.sh @@ -9,14 +9,14 @@ GITLAB_USERNAME=$(cat /opt/config/gitlab_username.txt) GITLAB_PASSWD=$(cat /opt/config/gitlab_password.txt) # Pull HBase container from a public docker hub -docker pull aaidocker/aai-hbase-1.2.3 +docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO +docker pull $NEXUS_USERNAME/aaidocker/aai-hbase-1.2.3 docker rm -f hbase-1.2.3 docker run -d --net=host --name="hbase-1.2.3" aaidocker/aai-hbase-1.2.3 # Wait 3 minutes before instantiating the A&AI container sleep 180 -docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO 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=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 diff --git a/boot/asdc_vm_init.sh b/boot/asdc_vm_init.sh index 5a31c1ca..34c90746 100644 --- a/boot/asdc_vm_init.sh +++ b/boot/asdc_vm_init.sh @@ -19,6 +19,8 @@ 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 +sed -i "s/\"ueb_url_list\":.*/\"ueb_url_list\": \"10.0.11.1,10.0.11.1\",/g" /data/environments/$ENV_NAME.json +sed -i "s/\"fqdn\":.*/\"fqdn\": [\"10.0.11.1\", \"10.0.11.1\"]/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 -r $RELEASE -p 10001 diff --git a/boot/policy_vm_init.sh b/boot/policy_vm_init.sh index 6ebfac92..7febca20 100644 --- a/boot/policy_vm_init.sh +++ b/boot/policy_vm_init.sh @@ -4,6 +4,8 @@ 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) +export DOCKER_REPOSITORY=${NEXUS_DOCKER_REPO} + cd /opt/policy git pull -- cgit 1.2.3-korg