diff options
| -rw-r--r-- | boot/esr_vm_init.sh | 19 | ||||
| -rw-r--r-- | boot/openo_all_serv.sh | 3 | ||||
| -rw-r--r-- | boot/openo_install.sh | 2 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack.env | 1 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack.yaml | 4 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_float.env | 1 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_float.yaml | 4 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_nofloat.env | 1 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_nofloat.yaml | 4 |
9 files changed, 38 insertions, 1 deletions
diff --git a/boot/esr_vm_init.sh b/boot/esr_vm_init.sh new file mode 100644 index 00000000..beb80419 --- /dev/null +++ b/boot/esr_vm_init.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +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/esr_docker.txt) + +source /opt/config/onap_ips.txt + +# start up esr +docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO +docker pull $NEXUS_DOCKER_REPO/onap/aai/esr-server:$DOCKER_IMAGE_VERSION +docker pull $NEXUS_DOCKER_REPO/onap/aai/esr-gui:$DOCKER_IMAGE_VERSION + +docker rm -f esr_server +docker rm -f esr_gui + +docker run -i -t -d -p 9518:9518 -e MSB_ADDR=$OPENO_IP:80 --name esr_server $NEXUS_DOCKER_REPO/onap/aai/esr-server:$DOCKER_IMAGE_VERSION +docker run -i -t -d -p 8080:9519 -e MSB_ADDR=$OPENO_IP:80 --name esr_gui $NEXUS_DOCKER_REPO/onap/aai/esr-gui:$DOCKER_IMAGE_VERSION
\ No newline at end of file diff --git a/boot/openo_all_serv.sh b/boot/openo_all_serv.sh index e451fb1b..9c523a8c 100644 --- a/boot/openo_all_serv.sh +++ b/boot/openo_all_serv.sh @@ -4,4 +4,5 @@ bash /opt/msb_vm_init.sh &>/dev/null &disown bash /opt/vnfsdk_vm_init.sh &>/dev/null &disown bash /opt/mvim_vm_init.sh &>/dev/null &disown bash /opt/vfc_vm_init.sh &>/dev/null &disown -bash /opt/uui_vm_init.sh &>/dev/null &disown
\ No newline at end of file +bash /opt/uui_vm_init.sh &>/dev/null &disown +bash /opt/esr_vm_init.sh &>/dev/null &disown
\ No newline at end of file diff --git a/boot/openo_install.sh b/boot/openo_install.sh index 24f84fd5..5066f7b3 100644 --- a/boot/openo_install.sh +++ b/boot/openo_install.sh @@ -62,6 +62,7 @@ curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/uui_vm_init.sh -o /opt curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/openo_all_serv.sh -o /opt/openo_all_serv.sh curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/openo_serv.sh -o /opt/openo_serv.sh curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/cli_install.sh -o /opt/cli_install.sh +curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/esr_vm_init.sh -o /opt/esr_vm_init.sh chmod +x /opt/vnfsdk_vm_init.sh chmod +x /opt/msb_vm_init.sh chmod +x /opt/mvim_vm_init.sh @@ -70,6 +71,7 @@ chmod +x /opt/uui_vm_init.sh chmod +x /opt/openo_all_serv.sh chmod +x /opt/openo_serv.sh chmod +x /opt/cli_install.sh +chmod +x /opt/esr_vm_init.sh mv /opt/openo_serv.sh /etc/init.d update-rc.d openo_serv.sh defaults diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index f199cba5..189dfd27 100644 --- a/heat/ONAP/onap_openstack.env +++ b/heat/ONAP/onap_openstack.env @@ -161,6 +161,7 @@ parameters: mvim_docker: latest vfc_docker: latest uui_docker: latest + esr_docker: latest dgbuilder_docker: 0.1-STAGING-latest cli_docker: 1.1-STAGING-latest diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index 21accaa5..e8e44a0c 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -331,6 +331,8 @@ parameters: type: string uui_docker: type: string + esr_docker: + type: string dgbuilder_docker: type: string cli_docker: @@ -1600,6 +1602,7 @@ resources: __mvim_docker__: { get_param: mvim_docker } __vfc_docker__: { get_param: vfc_docker } __uui_docker__: { get_param: uui_docker } + __esr_docker__: { get_param: esr_docker } __vnfsdk_repo__: { get_param: vnfsdk_repo } template: | #!/bin/bash @@ -1620,6 +1623,7 @@ resources: echo "__mvim_docker__" > /opt/config/mvim_docker.txt echo "__vfc_docker__" > /opt/config/vfc_docker.txt echo "__uui_docker__" > /opt/config/uui_docker.txt + echo "__esr_docker__" > /opt/config/esr_docker.txt echo "__vnfsdk_repo__" > /opt/config/vnfsdk_repo.txt # Create env file with the IP address of all ONAP components diff --git a/heat/ONAP/onap_openstack_float.env b/heat/ONAP/onap_openstack_float.env index 976805a2..e970b7f4 100644 --- a/heat/ONAP/onap_openstack_float.env +++ b/heat/ONAP/onap_openstack_float.env @@ -182,6 +182,7 @@ parameters: mvim_docker: latest vfc_docker: latest uui_docker: latest + esr_docker: latest dgbuilder_docker: 0.1-STAGING-latest cli_docker: 1.1-STAGING-latest diff --git a/heat/ONAP/onap_openstack_float.yaml b/heat/ONAP/onap_openstack_float.yaml index 010d44cd..46c49033 100644 --- a/heat/ONAP/onap_openstack_float.yaml +++ b/heat/ONAP/onap_openstack_float.yaml @@ -374,6 +374,8 @@ parameters: type: string uui_docker: type: string + esr_docker: + type: string dgbuilder_docker: type: string cli_docker: @@ -1661,6 +1663,7 @@ resources: __mvim_docker__: { get_param: mvim_docker } __vfc_docker__: { get_param: vfc_docker } __uui_docker__: { get_param: uui_docker } + __esr_docker__: { get_param: esr_docker } __vnfsdk_repo__: { get_param: vnfsdk_repo } template: | #!/bin/bash @@ -1681,6 +1684,7 @@ resources: echo "__mvim_docker__" > /opt/config/mvim_docker.txt echo "__vfc_docker__" > /opt/config/vfc_docker.txt echo "__uui_docker__" > /opt/config/uui_docker.txt + echo "__esr_docker__" > /opt/config/esr_docker.txt echo "__vnfsdk_repo__" > /opt/config/vnfsdk_repo.txt # Create env file with the IP address of all ONAP components diff --git a/heat/ONAP/onap_openstack_nofloat.env b/heat/ONAP/onap_openstack_nofloat.env index 6bf5e806..1b9cbd91 100644 --- a/heat/ONAP/onap_openstack_nofloat.env +++ b/heat/ONAP/onap_openstack_nofloat.env @@ -154,6 +154,7 @@ parameters: mvim_docker: latest vfc_docker: latest uui_docker: latest + esr_docker: latest dgbuilder_docker: 0.1-STAGING-latest cli_docker: 1.1-STAGING-latest diff --git a/heat/ONAP/onap_openstack_nofloat.yaml b/heat/ONAP/onap_openstack_nofloat.yaml index 697770b8..3ebd37ec 100644 --- a/heat/ONAP/onap_openstack_nofloat.yaml +++ b/heat/ONAP/onap_openstack_nofloat.yaml @@ -318,6 +318,8 @@ parameters: type: string uui_docker: type: string + esr_docker: + type: string dgbuilder_docker: type: string cli_docker: @@ -1531,6 +1533,7 @@ resources: __mvim_docker__: { get_param: mvim_docker } __vfc_docker__: { get_param: vfc_docker } __uui_docker__: { get_param: uui_docker } + __esr_docker__: { get_param: esr_docker } __vnfsdk_repo__: { get_param: vnfsdk_repo } template: | #!/bin/bash @@ -1551,6 +1554,7 @@ resources: echo "__mvim_docker__" > /opt/config/mvim_docker.txt echo "__vfc_docker__" > /opt/config/vfc_docker.txt echo "__uui_docker__" > /opt/config/uui_docker.txt + echo "__esr_docker__" > /opt/config/esr_docker.txt echo "__vnfsdk_repo__" > /opt/config/vnfsdk_repo.txt # Create env file with the IP address of all ONAP components |