diff options
| -rw-r--r-- | boot/dbcl_vm_init.sh | 2 | ||||
| -rw-r--r-- | boot/mr_vm_init.sh | 6 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack.env | 3 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack.yaml | 4 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_light.yaml | 4 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_template.env | 1 |
6 files changed, 15 insertions, 5 deletions
diff --git a/boot/dbcl_vm_init.sh b/boot/dbcl_vm_init.sh index ba9859ad..662837aa 100644 --- a/boot/dbcl_vm_init.sh +++ b/boot/dbcl_vm_init.sh @@ -4,7 +4,7 @@ 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) -DOCKER_IMAGE_VERSION=$(cat /opt/config/uui_docker.txt) +DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt) # Refresh images docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO diff --git a/boot/mr_vm_init.sh b/boot/mr_vm_init.sh index bed87371..78d61f8a 100644 --- a/boot/mr_vm_init.sh +++ b/boot/mr_vm_init.sh @@ -5,12 +5,12 @@ export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort 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) -DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt) docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO cd /opt/startup-vm-message-router/demo sed -i 's|wget .*|wget -q \"http://archive.apache.org/dist/kafka/${KAFKA_VERSION}/kafka_${SCALA_VERSION}-${KAFKA_VERSION}.tgz\" \\|g' deploy.sh -bash deploy.sh & +bash deploy.sh &>/dev/null &disown -bash dbcl_vm_init.sh & +cd /opt +bash dbcl_vm_init.sh &>/dev/null &disown diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index 9c199fa6..d60a7304 100644 --- a/heat/ONAP/onap_openstack.env +++ b/heat/ONAP/onap_openstack.env @@ -159,6 +159,7 @@ parameters: oof_docker: latest aaf_docker: 2.1.0-SNAPSHOT nbi_docker: latest + dbcl_docker: latest dcae_docker: 1.1.2 dcae_snmptrap_docker: latest @@ -214,7 +215,7 @@ parameters: ##################### aai_repo: http://gerrit.onap.org/r/aai/test-config appc_repo: http://gerrit.onap.org/r/appc/deployment.git - mr_repo: http://gerrit.onap.org/r/dmaap/messagerouter/messageservice.git + mr_repo: http://gerrit.onap.org/r/dcae/demo/startup/message-router.git so_repo: http://gerrit.onap.org/r/so/docker-config.git policy_repo: http://gerrit.onap.org/r/policy/docker.git portal_repo: http://gerrit.onap.org/r/portal.git diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index a7598de7..a63ff1aa 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -426,6 +426,8 @@ parameters: type: string nbi_docker: type: string + dbcl_docker: + type: string vfc_nokia_docker: type: string @@ -952,6 +954,7 @@ resources: __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } __mr_repo__: { get_param: mr_repo } + __dbcl_docker__: { get_param: dbcl_docker } template: | #!/bin/bash @@ -967,6 +970,7 @@ resources: echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt echo "__mr_repo__" > /opt/config/remote_repo.txt + echo "__dbcl_docker__" > /opt/config/docker_version.txt # Download and run install script curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/mr_install.sh -o /opt/mr_install.sh diff --git a/heat/ONAP/onap_openstack_light.yaml b/heat/ONAP/onap_openstack_light.yaml index 117a3180..f72f3d53 100644 --- a/heat/ONAP/onap_openstack_light.yaml +++ b/heat/ONAP/onap_openstack_light.yaml @@ -351,6 +351,8 @@ parameters: type: string nbi_docker: type: string + dbcl_docker: + type: string vfc_nokia_docker: type: string @@ -873,6 +875,7 @@ resources: __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } __mr_repo__: { get_param: mr_repo } + __dbcl_docker__: { get_param: dbcl_docker } template: | #!/bin/bash @@ -888,6 +891,7 @@ resources: echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt echo "__mr_repo__" > /opt/config/remote_repo.txt + echo "__dbcl_docker__" > /opt/config/docker_version.txt # Download and run install script curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/mr_install.sh -o /opt/mr_install.sh diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env index 1b3cd2ed..721fd9d7 100644 --- a/heat/ONAP/onap_openstack_template.env +++ b/heat/ONAP/onap_openstack_template.env @@ -159,6 +159,7 @@ parameters: oof_docker: ${OOF_DOCKER} aaf_docker: ${AAF_DOCKER} nbi_docker: ${NBI_DOCKER} + dbcl_docker: ${DBCL_DOCKER} dcae_docker: ${BOOTSTRAP_DOCKER} dcae_snmptrap_docker: ${SNMPTRAP_DOCKER} |