diff options
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/bind_zones | 9 | ||||
| -rw-r--r-- | boot/bind_zones_onap | 144 | ||||
| -rw-r--r-- | boot/db_simpledemo_onap_org | 134 | ||||
| -rw-r--r-- | boot/db_simpledemo_openecomp_org | 8 | ||||
| -rw-r--r-- | boot/dns_install.sh | 22 | ||||
| -rw-r--r-- | boot/esr_vm_init.sh | 19 | ||||
| -rw-r--r-- | boot/msb_vm_init.sh | 102 | ||||
| -rw-r--r-- | boot/named.conf.local | 5 | ||||
| -rw-r--r-- | boot/openo_all_serv.sh | 3 | ||||
| -rw-r--r-- | boot/openo_install.sh | 2 | ||||
| -rwxr-xr-x | boot/portal_vm_init.sh | 35 | ||||
| -rwxr-xr-x | boot/uui_vm_init.sh | 8 | ||||
| -rwxr-xr-x | boot/vfc_vm_init.sh | 6 |
13 files changed, 427 insertions, 70 deletions
diff --git a/boot/bind_zones b/boot/bind_zones index 0c8a114b..3823aa66 100644 --- a/boot/bind_zones +++ b/boot/bind_zones @@ -69,6 +69,10 @@ vm1.portal.simpledemo.openecomp.org. IN A portal_ip_addr c1.vm1.portal.simpledemo.openecomp.org. IN A portal_ip_addr c2.vm1.portal.simpledemo.openecomp.org. IN A portal_ip_addr +vm1.robot.simpledemo.openecomp.org. IN A robot_ip_addr +c1.vm1.robot.simpledemo.openecomp.org. IN A robot_ip_addr +c2.vm1.robot.simpledemo.openecomp.org. IN A robot_ip_addr + vm1.clamp.simpledemo.openecomp.org. IN A clamp_ip_addr c1.vm1.clamp.simpledemo.openecomp.org. IN A clamp_ip_addr c2.vm1.clamp.simpledemo.openecomp.org. IN A clamp_ip_addr @@ -124,6 +128,10 @@ collector.api.simpledemo.openecomp.org. IN A dcae_coll_ip_addr ;CLAMP clamp.api.simpledemo.openecomp.org. IN CNAME vm1.clamp.simpledemo.openecomp.org. +;ROBOT/SNIRO +robot.api.simpledemo.openecomp.org. IN CNAME vm1.robot.simpledemo.openecomp.org. +sniro.api.simpledemo.openecomp.org. IN CNAME vm1.robot.simpledemo.openecomp.org. + ;AAF ;aaf.api.simpledemo.openecomp.org. IN CNAME vm1.aaf.simpledemo.openecomp.org. @@ -133,3 +141,4 @@ mvim.api.simpledemo.openecomp.org. IN CNAME vm1.openo.simpledemo.openecomp.or vnfsdk.api.simpledemo.openecomp.org. IN CNAME vm1.openo.simpledemo.openecomp.org. vfc.api.simpledemo.openecomp.org. IN CNAME vm1.openo.simpledemo.openecomp.org. uui.api.simpledemo.openecomp.org. IN CNAME vm1.openo.simpledemo.openecomp.org. +esr.api.simpledemo.openecomp.org. IN CNAME vm1.openo.simpledemo.openecomp.org. diff --git a/boot/bind_zones_onap b/boot/bind_zones_onap new file mode 100644 index 00000000..29891646 --- /dev/null +++ b/boot/bind_zones_onap @@ -0,0 +1,144 @@ +; +; BIND data file for local loopback interface +; +$TTL 604800 +@ IN SOA simpledemo.onap.org. admin.simpledemo.onap.org. ( + 20170221 ; Serial + 604800 ; Refresh + 86400 ; Retry + 2419200 ; Expire + 604800 ) ; Negative Cache TTL +; +; name servers - NS records + IN NS simpledemo.onap.org. + +; name servers - A records +simpledemo.onap.org. IN A dns_ip_addr + +; +vm1.aai.simpledemo.onap.org. IN A aai1_ip_addr +c1.vm1.aai.simpledemo.onap.org. IN A aai1_ip_addr +c2.vm1.aai.simpledemo.onap.org. IN A aai1_ip_addr +c3.vm1.aai.simpledemo.onap.org. IN A aai1_ip_addr + +vm2.aai.simpledemo.onap.org. IN A aai2_ip_addr +c1.vm2.aai.simpledemo.onap.org. IN A aai2_ip_addr +c2.vm2.aai.simpledemo.onap.org. IN A aai2_ip_addr +c3.vm2.aai.simpledemo.onap.org. IN A aai2_ip_addr + +vm1.appc.simpledemo.onap.org. IN A appc_ip_addr +c1.vm1.appc.simpledemo.onap.org. IN A appc_ip_addr +c2.vm1.appc.simpledemo.onap.org. IN A appc_ip_addr + +vm1.sdc.simpledemo.onap.org. IN A sdc_ip_addr +c1.vm1.sdc.simpledemo.onap.org. IN A sdc_ip_addr +c2.vm1.sdc.simpledemo.onap.org. IN A sdc_ip_addr +c3.vm1.sdc.simpledemo.onap.org. IN A sdc_ip_addr +c4.vm1.sdc.simpledemo.onap.org. IN A sdc_ip_addr + +vm1.dcae.simpledemo.onap.org. IN A dcae_ip_addr +c1.vm1.dcae.simpledemo.onap.org. IN A dcae_ip_addr +c2.vm1.dcae.simpledemo.onap.org. IN A dcae_ip_addr +c3.vm1.dcae.simpledemo.onap.org IN A dcae_ip_addr + +vm1.mso.simpledemo.onap.org. IN A so_ip_addr +c1.vm1.mso.simpledemo.onap.org. IN A so_ip_addr +c1.vm1.mso.simpledemo.onap.org. IN A so_ip_addr + +vm1.policy.simpledemo.onap.org. IN A policy_ip_addr +c1.vm1.policy.simpledemo.onap.org. IN A policy_ip_addr +c2.vm1.policy.simpledemo.onap.org. IN A policy_ip_addr +c3.vm1.policy.simpledemo.onap.org. IN A policy_ip_addr +c4.vm1.policy.simpledemo.onap.org. IN A policy_ip_addr +c5.vm1.policy.simpledemo.onap.org. IN A policy_ip_addr +c6.vm1.policy.simpledemo.onap.org. IN A policy_ip_addr +c7.vm1.policy.simpledemo.onap.org. IN A policy_ip_addr +c8.vm1.policy.simpledemo.onap.org. IN A policy_ip_addr + +vm1.sdnc.simpledemo.onap.org. IN A sdnc_ip_addr +c1.vm1.sdnc.simpledemo.onap.org. IN A sdnc_ip_addr +c2.vm1.sdnc.simpledemo.onap.org. IN A sdnc_ip_addr +c3.vm1.sdnc.simpledemo.onap.org. IN A sdnc_ip_addr +c4.vm1.sdnc.simpledemo.onap.org. IN A sdnc_ip_addr + +vm1.vid.simpledemo.onap.org. IN A vid_ip_addr +c1.vm1.vid.simpledemo.onap.org. IN A vid_ip_addr +c2.vm1.vid.simpledemo.onap.org. IN A vid_ip_addr + +vm1.portal.simpledemo.onap.org. IN A portal_ip_addr +c1.vm1.portal.simpledemo.onap.org. IN A portal_ip_addr +c2.vm1.portal.simpledemo.onap.org. IN A portal_ip_addr + +vm1.robot.simpledemo.onap.org. IN A robot_ip_addr +c1.vm1.robot.simpledemo.onap.org. IN A robot_ip_addr +c2.vm1.robot.simpledemo.onap.org. IN A robot_ip_addr + +vm1.clamp.simpledemo.onap.org. IN A clamp_ip_addr +c1.vm1.clamp.simpledemo.onap.org. IN A clamp_ip_addr +c2.vm1.clamp.simpledemo.onap.org. IN A clamp_ip_addr + +;vm1.aaf.simpledemo.onap.org. IN A aaf_ip_addr + +vm1.mr.simpledemo.onap.org. IN A mr_ip_addr + +vm1.openo.simpledemo.onap.org. IN A openo_ip_addr + + +;CNAMES +;A&AI +aai.api.simpledemo.onap.org. IN CNAME vm1.aai.simpledemo.onap.org. +aai.ui.simpledemo.onap.org. IN CNAME vm1.aai.simpledemo.onap.org. +aai.searchservice.simpledemo.onap.org. IN CNAME vm1.aai.simpledemo.onap.org. +aai.hbase.simpledemo.onap.org. IN CNAME vm2.aai.simpledemo.onap.org. +aai.gremlinserver.simpledemo.onap.org. IN CNAME vm2.aai.simpledemo.onap.org. +aai.elasticsearch.simpledemo.onap.org. IN CNAME vm2.aai.simpledemo.onap.org. + +;APPC +appc.api.simpledemo.onap.org. IN CNAME vm1.appc.simpledemo.onap.org. + +;ASDC +sdc.api.simpledemo.onap.org. IN CNAME vm1.sdc.simpledemo.onap.org. + +;DCAE +dcae.api.simpledemo.onap.org. IN CNAME vm1.dcae.simpledemo.onap.org. + +;SO +mso.api.simpledemo.onap.org. IN CNAME vm1.mso.simpledemo.onap.org. + +;Policy +policy.api.simpledemo.onap.org. IN CNAME vm1.policy.simpledemo.onap.org. + +;SDNC +sdnc.api.simpledemo.onap.org. IN CNAME vm1.sdnc.simpledemo.onap.org. + +;VID +vid.api.simpledemo.onap.org. IN CNAME vm1.vid.simpledemo.onap.org. + +;PORTAL +portal.api.simpledemo.onap.org. IN CNAME vm1.portal.simpledemo.onap.org. + +;Message Router +;mr.api.simpledemo.onap.org. IN CNAME vm1.mr.simpledemo.onap.org. +ueb.api.simpledemo.onap.org. IN CNAME vm1.mr.simpledemo.onap.org. +mr.api.simpledemo.onap.org. IN A dcae_coll_ip_addr +collector.api.simpledemo.onap.org. IN A dcae_coll_ip_addr +;dbc.api.simpledemo.onap.org. IN CNAME vm1.mr.simpledemo.onap.org. +;drprov.api.simpledemo.onap.org. IN CNAME vm1.mr.simpledemo.onap.org. + +;CLAMP +clamp.api.simpledemo.onap.org. IN CNAME vm1.clamp.simpledemo.onap.org. + +;ROBOT/SNIRO +robot.api.simpledemo.onap.org. IN CNAME vm1.robot.simpledemo.onap.org. +sniro.api.simpledemo.onap.org. IN CNAME vm1.robot.simpledemo.onap.org. + +;AAF +;aaf.api.simpledemo.onap.org. IN CNAME vm1.aaf.simpledemo.onap.org. + +;OPEN-O +msb.api.simpledemo.onap.org. IN CNAME vm1.openo.simpledemo.onap.org. +mvim.api.simpledemo.onap.org. IN CNAME vm1.openo.simpledemo.onap.org. +vnfsdk.api.simpledemo.onap.org. IN CNAME vm1.openo.simpledemo.onap.org. +vfc.api.simpledemo.onap.org. IN CNAME vm1.openo.simpledemo.onap.org. +uui.api.simpledemo.onap.org. IN CNAME vm1.openo.simpledemo.onap.org. +esr.api.simpledemo.onap.org. IN CNAME vm1.openo.simpledemo.onap.org.
\ No newline at end of file diff --git a/boot/db_simpledemo_onap_org b/boot/db_simpledemo_onap_org new file mode 100644 index 00000000..ca583c9b --- /dev/null +++ b/boot/db_simpledemo_onap_org @@ -0,0 +1,134 @@ +; +; BIND data file for local loopback interface +; +$TTL 604800 +@ IN SOA simpledemo.onap.org. admin.simpledemo.onap.org. ( + 20170221 ; Serial + 604800 ; Refresh + 86400 ; Retry + 2419200 ; Expire + 604800 ) ; Negative Cache TTL +; +; name servers - NS records + IN NS simpledemo.onap.org. + +; name servers - A records +simpledemo.onap.org. IN A 10.0.0.1 + +; +vm1.aai.simpledemo.onap.org. IN A 10.0.1.1 +c1.vm1.aai.simpledemo.onap.org. IN A 10.0.1.1 +c2.vm1.aai.simpledemo.onap.org. IN A 10.0.1.1 +c3.vm1.aai.simpledemo.onap.org. IN A 10.0.1.1 + +vm2.aai.simpledemo.onap.org. IN A 10.0.1.2 +c1.vm2.aai.simpledemo.onap.org. IN A 10.0.1.2 +c2.vm2.aai.simpledemo.onap.org. IN A 10.0.1.2 +c3.vm2.aai.simpledemo.onap.org. IN A 10.0.1.2 + +vm1.appc.simpledemo.onap.org. IN A 10.0.2.1 +c1.vm1.appc.simpledemo.onap.org. IN A 10.0.2.1 +c2.vm1.appc.simpledemo.onap.org. IN A 10.0.2.1 + +vm1.sdc.simpledemo.onap.org. IN A 10.0.3.1 +c1.vm1.sdc.simpledemo.onap.org. IN A 10.0.3.1 +c2.vm1.sdc.simpledemo.onap.org. IN A 10.0.3.1 +c3.vm1.sdc.simpledemo.onap.org. IN A 10.0.3.1 +c4.vm1.sdc.simpledemo.onap.org. IN A 10.0.3.1 + +vm1.dcae.simpledemo.onap.org. IN A 10.0.4.1 +c1.vm1.dcae.simpledemo.onap.org. IN A 10.0.4.1 +c2.vm1.dcae.simpledemo.onap.org. IN A 10.0.4.1 +c3.vm1.dcae.simpledemo.onap.org IN A 10.0.4.1 + +vm1.mso.simpledemo.onap.org. IN A 10.0.5.1 +c1.vm1.mso.simpledemo.onap.org. IN A 10.0.5.1 +c1.vm1.mso.simpledemo.onap.org. IN A 10.0.5.1 + +vm1.policy.simpledemo.onap.org. IN A 10.0.6.1 +c1.vm1.policy.simpledemo.onap.org. IN A 10.0.6.1 +c2.vm1.policy.simpledemo.onap.org. IN A 10.0.6.1 +c3.vm1.policy.simpledemo.onap.org. IN A 10.0.6.1 +c4.vm1.policy.simpledemo.onap.org. IN A 10.0.6.1 +c5.vm1.policy.simpledemo.onap.org. IN A 10.0.6.1 +c6.vm1.policy.simpledemo.onap.org. IN A 10.0.6.1 +c7.vm1.policy.simpledemo.onap.org. IN A 10.0.6.1 +c8.vm1.policy.simpledemo.onap.org. IN A 10.0.6.1 + +vm1.sdnc.simpledemo.onap.org. IN A 10.0.7.1 +c1.vm1.sdnc.simpledemo.onap.org. IN A 10.0.7.1 +c2.vm1.sdnc.simpledemo.onap.org. IN A 10.0.7.1 +c3.vm1.sdnc.simpledemo.onap.org. IN A 10.0.7.1 +c4.vm1.sdnc.simpledemo.onap.org. IN A 10.0.7.1 + +vm1.vid.simpledemo.onap.org. IN A 10.0.8.1 +c1.vm1.vid.simpledemo.onap.org. IN A 10.0.8.1 +c2.vm1.vid.simpledemo.onap.org. IN A 10.0.8.1 + +vm1.portal.simpledemo.onap.org. IN A 10.0.9.1 +c1.vm1.portal.simpledemo.onap.org. IN A 10.0.9.1 +c2.vm1.portal.simpledemo.onap.org. IN A 10.0.9.1 + +vm1.robot.simpledemo.onap.org. IN A 10.0.10.1 +c1.vm1.robot.simpledemo.onap.org. IN A 10.0.10.1 +c2.vm1.robot.simpledemo.onap.org. IN A 10.0.10.1 + +vm1.aaf.simpledemo.onap.org. IN A 10.0.13.1 + +vm1.mr.simpledemo.onap.org. IN A 10.0.11.1 + +vm1.clamp.simpledemo.onap.org. IN A 10.0.12.1 +c1.vm1.clamp.simpledemo.onap.org. IN A 10.0.12.1 +c2.vm1.clamp.simpledemo.onap.org. IN A 10.0.12.1 + + +;CNAMES +;A&AI +aai.api.simpledemo.onap.org. IN CNAME vm1.aai.simpledemo.onap.org. +aai.ui.simpledemo.onap.org. IN CNAME vm1.aai.simpledemo.onap.org. +aai.searchservice.simpledemo.onap.org. IN CNAME vm1.aai.simpledemo.onap.org. +aai.hbase.simpledemo.onap.org. IN CNAME vm2.aai.simpledemo.onap.org. +aai.gremlinserver.simpledemo.onap.org. IN CNAME vm2.aai.simpledemo.onap.org. +aai.elasticsearch.simpledemo.onap.org. IN CNAME vm2.aai.simpledemo.onap.org. + +;APPC +appc.api.simpledemo.onap.org. IN CNAME vm1.appc.simpledemo.onap.org. + +;ASDC +sdc.api.simpledemo.onap.org. IN CNAME vm1.sdc.simpledemo.onap.org. + +;DCAE +dcae.api.simpledemo.onap.org. IN CNAME vm1.dcae.simpledemo.onap.org. + +;MSO +mso.api.simpledemo.onap.org. IN CNAME vm1.mso.simpledemo.onap.org. + +;Policy +policy.api.simpledemo.onap.org. IN CNAME vm1.policy.simpledemo.onap.org. + +;SDNC +sdnc.api.simpledemo.onap.org. IN CNAME vm1.sdnc.simpledemo.onap.org. + +;VID +vid.api.simpledemo.onap.org. IN CNAME vm1.vid.simpledemo.onap.org. + +;PORTAL +portal.api.simpledemo.onap.org. IN CNAME vm1.portal.simpledemo.onap.org. + +;Message Router +;mr.api.simpledemo.onap.org. IN CNAME vm1.mr.simpledemo.onap.org. +ueb.api.simpledemo.onap.org. IN CNAME vm1.mr.simpledemo.onap.org. +mr.api.simpledemo.onap.org. IN A 10.0.4.102 +collector.api.simpledemo.onap.org. IN A 10.0.4.102 +;dbc.api.simpledemo.onap.org. IN CNAME vm1.mr.simpledemo.onap.org. +;drprov.api.simpledemo.onap.org. IN CNAME vm1.mr.simpledemo.onap.org. + +;ROBOT/SNIRO +robot.api.simpledemo.onap.org. IN CNAME vm1.robot.simpledemo.onap.org. +sniro.api.simpledemo.onap.org. IN CNAME vm1.robot.simpledemo.onap.org. + +;CLAMP +clamp.api.simpledemo.onap.org. IN CNAME vm1.clamp.simpledemo.onap.org. + +;AAF +aaf.api.simpledemo.onap.org. IN CNAME vm1.aaf.simpledemo.onap.org. diff --git a/boot/db_simpledemo_openecomp_org b/boot/db_simpledemo_openecomp_org index 942be995..b025f7bb 100644 --- a/boot/db_simpledemo_openecomp_org +++ b/boot/db_simpledemo_openecomp_org @@ -69,6 +69,10 @@ 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.robot.simpledemo.openecomp.org. IN A 10.0.10.1 +c1.vm1.robot.simpledemo.openecomp.org. IN A 10.0.10.1 +c2.vm1.robot.simpledemo.openecomp.org. IN A 10.0.10.1 + vm1.aaf.simpledemo.openecomp.org. IN A 10.0.13.1 vm1.mr.simpledemo.openecomp.org. IN A 10.0.11.1 @@ -119,6 +123,10 @@ 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. +;ROBOT/SNIRO +robot.api.simpledemo.openecomp.org. IN CNAME vm1.robot.simpledemo.openecomp.org. +sniro.api.simpledemo.openecomp.org. IN CNAME vm1.robot.simpledemo.openecomp.org. + ;CLAMP clamp.api.simpledemo.openecomp.org. IN CNAME vm1.clamp.simpledemo.openecomp.org. diff --git a/boot/dns_install.sh b/boot/dns_install.sh index 27ea2233..2985bb7d 100644 --- a/boot/dns_install.sh +++ b/boot/dns_install.sh @@ -9,16 +9,18 @@ if [[ $CLOUD_ENV != "rackspace" ]] then # Add host name to /etc/host to avoid warnings in openstack images echo 127.0.0.1 $(hostname) >> /etc/hosts - + # Allow remote login as root mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk cp /home/ubuntu/.ssh/authorized_keys /root/.ssh # Set the Bind configuration file name based on the deployment environment ZONE_FILE="bind_zones" + ZONE_ONAP="bind_zones_onap" OPTIONS_FILE="bind_options" else ZONE_FILE="db_simpledemo_openecomp_org" + ZONE_ONAP="db_simpledemo_onap_org" OPTIONS_FILE="named.conf.options" fi @@ -58,6 +60,7 @@ apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates w # Download script mkdir /etc/bind/zones curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/$ZONE_FILE -o /etc/bind/zones/db.simpledemo.openecomp.org +curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/$ZONE_ONAP -o /etc/bind/zones/db.simpledemo.onap.org curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/$OPTIONS_FILE -o /etc/bind/named.conf.options curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/named.conf.local -o /etc/bind/named.conf.local @@ -82,6 +85,23 @@ then sed -i "s/dcae_coll_ip_addr/"$(cat /opt/config/dcae_coll_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org sed -i "s/clamp_ip_addr/"$(cat /opt/config/clamp_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org sed -i "s/openo_ip_addr/"$(cat /opt/config/openo_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org + + sed -i "s/aai1_ip_addr/"$(cat /opt/config/aai1_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org + sed -i "s/aai2_ip_addr/"$(cat /opt/config/aai2_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org + sed -i "s/appc_ip_addr/"$(cat /opt/config/appc_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org + sed -i "s/dcae_ip_addr/"$(cat /opt/config/dcae_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org + sed -i "s/dns_ip_addr/"$(cat /opt/config/dns_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org + sed -i "s/so_ip_addr/"$(cat /opt/config/so_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org + sed -i "s/mr_ip_addr/"$(cat /opt/config/mr_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org + sed -i "s/policy_ip_addr/"$(cat /opt/config/policy_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org + sed -i "s/portal_ip_addr/"$(cat /opt/config/portal_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org + sed -i "s/robot_ip_addr/"$(cat /opt/config/robot_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org + sed -i "s/sdc_ip_addr/"$(cat /opt/config/sdc_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org + sed -i "s/sdnc_ip_addr/"$(cat /opt/config/sdnc_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org + sed -i "s/vid_ip_addr/"$(cat /opt/config/vid_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org + sed -i "s/dcae_coll_ip_addr/"$(cat /opt/config/dcae_coll_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org + sed -i "s/clamp_ip_addr/"$(cat /opt/config/clamp_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org + sed -i "s/openo_ip_addr/"$(cat /opt/config/openo_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org fi # Configure Bind 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/msb_vm_init.sh b/boot/msb_vm_init.sh index d615a2d4..e478281d 100644 --- a/boot/msb_vm_init.sh +++ b/boot/msb_vm_init.sh @@ -4,8 +4,6 @@ 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/msb_docker.txt) -NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) -ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) source /opt/config/onap_ips.txt @@ -30,99 +28,107 @@ docker run -d -p 80:80 -e CONSUL_IP=$CONSUL_IP -e SDCLIENT_IP=$DISCOVERY_IP -e " sleep 20 # register ONAP services to MSB -export ONAP_HOST_URL=http://$OPENO_IP:80 -export CLI_PRODUCT_VERSION=onap-1.1 -onap -v - #aai -onap microservice-create --service-name aai-cloudInfrastructure --service-version v11 --service-url /aai/v11/cloud-infrastructure $AAI_IP1 8443 +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-cloudInfrastructure", "version": "v11", "url": "/aai/v11/cloud-infrastructure","protocol": "REST", "enable_ssl":"true", "nodes": [ {"ip": "'$AAI_IP1'","port": "8443"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" + +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-cloudInfrastructure-deprecated", "version": "v11", "url": "/aai/v11/cloud-infrastructure","path": "/aai/v11/cloud-infrastructure","protocol": "REST", "enable_ssl":"true", "nodes": [ {"ip": "'$AAI_IP1'","port": "8443"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" + +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-business", "version": "v11", "url": "/aai/v11/business","protocol": "REST", "enable_ssl":"true", "nodes": [ {"ip": "'$AAI_IP1'","port": "8443"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" + +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-business-deprecated", "version": "v11", "url": "/aai/v11/business","path": "/aai/v11/business","protocol": "REST", "enable_ssl":"true", "nodes": [ {"ip": "'$AAI_IP1'","port": "8443"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -onap microservice-create --service-name aai-cloudInfrastructure-deprecated --service-version v11 --service-url /aai/v11/cloud-infrastructure $AAI_IP1 8443 +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-search", "version": "v11", "url": "/aai/v11/search","protocol": "REST", "enable_ssl":"true", "nodes": [ {"ip": "'$AAI_IP1'","port": "8443"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -onap microservice-create --service-name aai-business --service-version v11 --service-url /aai/v11/business $AAI_IP1 8443 +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-search-deprecated", "version": "v11", "url": "/aai/v11/search","path": "/aai/v11/search","protocol": "REST", "enable_ssl":"true", "nodes": [ {"ip": "'$AAI_IP1'","port": "8443"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -onap microservice-create --service-name aai-business-deprecated --service-version v11 --service-url /aai/v11/business $AAI_IP1 8443 +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-actions", "version": "v11", "url": "/aai/v11/actions","protocol": "REST", "enable_ssl":"true", "nodes": [ {"ip": "'$AAI_IP1'","port": "8443"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -onap microservice-create --service-name aai-search --service-version v11 --service-url /aai/v11/search $AAI_IP1 8443 +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-actions-deprecated", "version": "v11", "url": "/aai/v11/actions","path": "/aai/v11/actions","protocol": "REST", "enable_ssl":"true", "nodes": [ {"ip": "'$AAI_IP1'","port": "8443"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -onap microservice-create --service-name aai-search-deprecated --service-version v11 --service-url /aai/v11/search $AAI_IP1 8443 +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-service-design-and-creation", "version": "v11", "url": "/aai/v11/service-design-and-creation","protocol": "REST", "enable_ssl":"true", "nodes": [ {"ip": "'$AAI_IP1'","port": "8443"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -onap microservice-create --service-name aai-actions --service-version v11 --service-url /aai/v11/actions $AAI_IP1 8443 +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-service-design-and-creation-deprecated", "version": "v11", "url": "/aai/v11/service-design-and-creation","path": "/aai/v11/service-design-and-creation","protocol": "REST", "enable_ssl":"true", "nodes": [ {"ip": "'$AAI_IP1'","port": "8443"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -onap microservice-create --service-name aai-actions-deprecated --service-version v11 --service-url /aai/v11/actions $AAI_IP1 8443 +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-network", "version": "v11", "url": "/aai/v11/network","protocol": "REST", "enable_ssl":"true", "nodes": [ {"ip": "'$AAI_IP1'","port": "8443"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -onap microservice-create --service-name aai-service-design-and-creation --service-version v11 --service-url /aai/v11/service-design-and-creation $AAI_IP1 8443 +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-network-deprecated", "version": "v11", "url": "/aai/v11/network","path": "/aai/v11/network","protocol": "REST", "enable_ssl":"true", "nodes": [ {"ip": "'$AAI_IP1'","port": "8443"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -onap microservice-create --service-name aai-service-design-and-creation-deprecated --service-version v11 --service-url /aai/v11/service-design-and-creation $AAI_IP1 8443 +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-externalSystem", "version": "v11", "url": "/aai/v11/external-system","protocol": "REST", "enable_ssl":"true", "visualRange":"1", "nodes": [ {"ip": "'$AAI_IP1'","port": "8443"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -onap microservice-create --service-name aai-network --service-version v11 --service-url /aai/v11/network $AAI_IP1 8443 +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-externalSystem-deprecated", "version": "v11", "url": "/aai/v11/external-system","path": "/aai/v11/external-system","protocol": "REST", "enable_ssl":"true", "nodes": [ {"ip": "'$AAI_IP1'","port": "8443"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -onap microservice-create --service-name aai-network-deprecated --service-version v11 --service-url /aai/v11/network $AAI_IP1 8443 +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-esr-server", "version": "v1", "url": "/api/aai-esr-server/v1","protocol": "REST", "visualRange":"1", "nodes": [ {"ip": "'$OPENO_IP'","port": "9518"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" + +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-esr-gui", "version": "v1", "url": "/esr-gui","path": "/iui/aai-esr-gui","protocol": "UI", "nodes": [ {"ip": "'$OPENO_IP'","port": "9519"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" #so -onap microservice-create --service-name so --service-version v1 --service-url /ecomp/mso/infra $SO_IP 8080 +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "so", "version": "v1", "url": "/ecomp/mso/infra","protocol": "REST", "nodes": [ {"ip": "'$SO_IP'","port": "8080"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -onap microservice-create --service-name so-deprecated --service-version v1 --service-url /ecomp/mso/infra $SO_IP 8080 +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "so-deprecated", "version": "v1", "url": "/ecomp/mso/infra","path": "/ecomp/mso/infra","protocol": "REST", "nodes": [ {"ip": "'$SO_IP'","port": "8080"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" #Dmaap message router -#curl -X POST -H "Content-Type: application/json" '{"serviceName": "message-router", "version": "v1", "url": "/","protocol": "REST", "nodes": [ {"ip": "'$DMAAP_IP'","port": "3904"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +#curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "message-router", "version": "v1", "url": "/","protocol": "REST", "nodes": [ {"ip": "'$DMAAP_IP'","port": "3904"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" #policy -onap microservice-create --service-name policy-pdp --service-version v1 --service-url /ecomp/mso/infra $POLICY_IP 8081 +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "policy-pdp", "version": "v1", "url": "/pdp","protocol": "REST", "nodes": [ {"ip": "'$POLICY_IP'","port": "8081"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -onap microservice-create --service-name policy-pdp-deprecated --service-version v1 --service-url /ecomp/mso/infra $POLICY_IP 8081 +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "policy-pdp-deprecated", "version": "v1", "url": "/pdp","path": "/pdp","protocol": "REST", "nodes": [ {"ip": "'$POLICY_IP'","port": "8081"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" #portal -onap microservice-create --service-name portal --service-version v2 --service-url / $PORTAL_IP 8989 +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "portal", "version": "v2", "url": "/","protocol": "REST", "nodes": [ {"ip": "'$PORTAL_IP'","port": "8989"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" #sdc -onap microservice-create --service-name sdc --service-version v1 --service-url /sdc/v1 $SDC_IP 8080 +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "sdc", "version": "v1", "url": "/sdc/v1","protocol": "REST", "nodes": [ {"ip": "'$SDC_IP'","port": "8080"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -onap microservice-create --service-name sdc-deprecated --service-version v1 --service-url /sdc/v1 $SDC_IP 8080 +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "sdc-deprecated", "version": "v1", "url": "/sdc/v1","path": "/sdc/v1","protocol": "REST", "nodes": [ {"ip": "'$SDC_IP'","port": "8080"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" #sdnc -onap microservice-create --service-name sdnc --service-version v1 --service-url /sdc/v1 $SDNC_IP 8282 +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "sdnc", "version": "v1", "url": "/","protocol": "REST", "nodes": [ {"ip": "'$SDNC_IP'","port": "8282"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -onap microservice-create --service-name sdnc-deprecated --service-version v1 --service-url /restconf $SDNC_IP 8282 +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "sdnc", "version": "v1", "url": "/restconf","path": "/restconf","protocol": "REST", "nodes": [ {"ip": "'$SDNC_IP'","port": "8282"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" #multi-vim -onap microservice-create --service-name multicloud-titanium_cloud --service-version v0 --service-url /api/multicloud-titanium_cloud/v0 $OPENO_IP 9005 +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud", "version": "v0", "url": "/api/multicloud/v0","protocol": "REST", "nodes": [ {"ip": "'$OPENO_IP'","port": "9001"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" + +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud-vio", "version": "v0", "url": "/api/multicloud-vio/v0","protocol": "REST", "nodes": [ {"ip": "'$OPENO_IP'","port": "9004"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" + +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud-ocata", "version": "v0", "url": "/api/multicloud-ocata/v0","protocol": "REST", "nodes": [ {"ip": "'$OPENO_IP'","port": "9006"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" + +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud-titanium_cloud", "version": "v0", "url": "/api/multicloud-titanium_cloud/v0","protocol": "REST", "nodes": [ {"ip": "'$OPENO_IP'","port": "9005"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" #VF-C -onap microservice-create --service-name nslcm --service-version v1 --service-url /api/nslcm/v1 $OPENO_IP 8403 +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "nslcm", "version": "v1", "url": "/api/nslcm/v1","protocol": "REST", "nodes": [ {"ip": "'$OPENO_IP'","port": "8403"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -onap microservice-create --service-name ztevmanagerdriver --service-version v1 --service-url /api/ztevmanagerdriver/v1 $OPENO_IP 8410 +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "ztevmanagerdriver", "version": "v1", "url": "/api/ztevmanagerdriver/v1","protocol": "REST", "nodes": [ {"ip": "'$OPENO_IP'","port": "8410"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -onap microservice-create --service-name ztesdncdriver --service-version v1 --service-url /api/ztesdncdriver/v1 $OPENO_IP 8411 +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "ztesdncdriver", "version": "v1", "url": "/api/ztesdncdriver/v1","protocol": "REST", "nodes": [ {"ip": "'$OPENO_IP'","port": "8411"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -onap microservice-create --service-name resmgr --service-version v1 --service-url /api/resmgr/v1 $OPENO_IP 8480 +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "resmgr", "version": "v1", "url": "/api/resmgr/v1","protocol": "REST", "nodes": [ {"ip": "'$OPENO_IP'","port": "8480"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -onap microservice-create --service-name gvnfmdriver --service-version v1 --service-url /api/gvnfmdriver/v1 $OPENO_IP 8484 +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "gvnfmdriver", "version": "v1", "url": "/api/gvnfmdriver/v1","protocol": "REST", "nodes": [ {"ip": "'$OPENO_IP'","port": "8484"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -onap microservice-create --service-name huaweivnfmdriver --service-version v1 --service-url /api/huaweivnfmdriver/v1 $OPENO_IP 8482 +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "huaweivnfmdriver", "version": "v1", "url": "/api/huaweivnfmdriver/v1","protocol": "REST", "nodes": [ {"ip": "'$OPENO_IP'","port": "8482"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -onap microservice-create --service-name nokiavnfmdriver --service-version v1 --service-url /api/nokiavnfmdriver/v1 $OPENO_IP 8485 +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "nokiavnfmdriver", "version": "v1", "url": "/api/nokiavnfmdriver/v1","protocol": "REST", "nodes": [ {"ip": "'$OPENO_IP'","port": "8485"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -onap microservice-create --service-name jujuvnfmdriver --service-version v1 --service-url /api/jujuvnfmdriver/v1 $OPENO_IP 8483 +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "jujuvnfmdriver", "version": "v1", "url": "/api/jujuvnfmdriver/v1","protocol": "REST", "nodes": [ {"ip": "'$OPENO_IP'","port": "8483"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -onap microservice-create --service-name vnflcm --service-version v1 --service-url /api/vnflcm/v1 $OPENO_IP 8801 +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "vnflcm", "version": "v1", "url": "/api/vnflcm/v1","protocol": "REST", "nodes": [ {"ip": "'$OPENO_IP'","port": "8801"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -onap microservice-create --service-name vnfres --service-version v1 --service-url /api/vnfres/v1 $OPENO_IP 8802 +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "vnfres", "version": "v1", "url": "/api/vnfres/v1","protocol": "REST", "nodes": [ {"ip": "'$OPENO_IP'","port": "8802"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -onap microservice-create --service-name vnfmgr --service-version v1 --service-url /api/vnfmgr/v1 $OPENO_IP 8803 +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "vnfmgr", "version": "v1", "url": "/api/vnfmgr/v1","protocol": "REST", "nodes": [ {"ip": "'$OPENO_IP'","port": "8803"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -onap microservice-create --service-name activiti --service-version v1 --service-url /api/activiti/v1 $OPENO_IP 8804 +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "activiti", "version": "v1", "url": "/api/activiti/v1","protocol": "REST", "nodes": [ {"ip": "'$OPENO_IP'","port": "8804"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -onap microservice-create --service-name activiti --service-version v1 --service-url /api/workflow/v1 $OPENO_IP 8805 +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "workflow", "version": "v1", "url": "/api/workflow/v1","protocol": "REST", "nodes": [ {"ip": "'$OPENO_IP'","port": "8805"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -onap microservice-create --service-name catalog --service-version v1 --service-url /api/catalog/v1 $OPENO_IP 8806 +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "catalog", "version": "v1", "url": "/api/catalog/v1","protocol": "REST", "nodes": [ {"ip": "'$OPENO_IP'","port": "8806"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -onap microservice-create --service-name emsdriver --service-version v1 --service-url /api/emsdriver/v1 $OPENO_IP 8206 +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "emsdriver", "version": "v1", "url": "/api/emsdriver/v1","protocol": "REST", "nodes": [ {"ip": "'$OPENO_IP'","port": "8206"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" #UUI -onap microservice-create --service-name usecaseui --service-version v1 --service-url /api/usecaseui/server/v1 $OPENO_IP 8901 +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "usecaseui", "version": "v1", "url": "/api/usecaseui/server/v1","protocol": "REST", "nodes": [ {"ip": "'$OPENO_IP'","port": "8901"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -onap microservice-create --service-name usecaseui-gui --service-version v1 --service-url /iui/usecaseui $OPENO_IP 8900 +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "usecaseui-gui", "version": "v1", "url": "/iui/usecaseui","path": "/iui/usecaseui","protocol": "UI", "nodes": [ {"ip": "'$OPENO_IP'","port": "8900"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -#Print the registered services -onap microservice-list --long diff --git a/boot/named.conf.local b/boot/named.conf.local index c7c82f3b..f372cba8 100644 --- a/boot/named.conf.local +++ b/boot/named.conf.local @@ -10,3 +10,8 @@ zone "simpledemo.openecomp.org" { type master; file "/etc/bind/zones/db.simpledemo.openecomp.org"; # zone file path }; + +zone "simpledemo.onap.org" { + type master; + file "/etc/bind/zones/db.simpledemo.onap.org"; # zone file path +}; 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/boot/portal_vm_init.sh b/boot/portal_vm_init.sh index c58f22f0..7d1c5351 100755 --- a/boot/portal_vm_init.sh +++ b/boot/portal_vm_init.sh @@ -10,6 +10,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) DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt) +# Use "latest" to deploy snapshot images: +# DOCKER_IMAGE_VERSION=latest CLI_DOCKER_VERSION=$(cat /opt/config/cli_docker_version.txt) # Refresh configuration and scripts @@ -20,27 +22,28 @@ cd deliveries # Get image names used below from docker-compose environment file source .env -# Copy property files -ETC=/PROJECT/OpenSource/UbuntuEP/etc -mkdir -p $ETC -cp -r properties_rackspace/* $ETC - # Refresh images docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO -docker pull $NEXUS_DOCKER_REPO/openecomp/${DB_IMG_NAME}:$DOCKER_IMAGE_VERSION -docker pull $NEXUS_DOCKER_REPO/openecomp/${EP_IMG_NAME}:$DOCKER_IMAGE_VERSION -docker pull $NEXUS_DOCKER_REPO/openecomp/${WMS_IMG_NAME}:$DOCKER_IMAGE_VERSION -# Add CLI docker image -docker pull $NEXUS_DOCKER_REPO/onap/cli:$CLI_DOCKER_VERSION +docker pull $NEXUS_DOCKER_REPO/$DB_IMG_NAME:$DOCKER_IMAGE_VERSION +docker pull $NEXUS_DOCKER_REPO/$EP_IMG_NAME:$DOCKER_IMAGE_VERSION +docker pull $NEXUS_DOCKER_REPO/$WMS_IMG_NAME:$DOCKER_IMAGE_VERSION +docker pull $NEXUS_DOCKER_REPO/$CLI_IMG_NAME:$CLI_DOCKER_VERSION # Tag them as expected by docker-compose file -docker tag $NEXUS_DOCKER_REPO/openecomp/${DB_IMG_NAME}:$DOCKER_IMAGE_VERSION $DB_IMG_NAME:$PORTAL_TAG -docker tag $NEXUS_DOCKER_REPO/openecomp/${EP_IMG_NAME}:$DOCKER_IMAGE_VERSION $EP_IMG_NAME:$PORTAL_TAG -docker tag $NEXUS_DOCKER_REPO/openecomp/${WMS_IMG_NAME}:$DOCKER_IMAGE_VERSION $WMS_IMG_NAME:$PORTAL_TAG -# Add tagging for CLI docker image as expected by docker-compose file -docker tag $NEXUS_DOCKER_REPO/onap/cli:$CLI_DOCKER_VERSION onap/cli:$PORTAL_TAG +docker tag $NEXUS_DOCKER_REPO/$DB_IMG_NAME:$DOCKER_IMAGE_VERSION $DB_IMG_NAME:$PORTAL_TAG +docker tag $NEXUS_DOCKER_REPO/$EP_IMG_NAME:$DOCKER_IMAGE_VERSION $EP_IMG_NAME:$PORTAL_TAG +docker tag $NEXUS_DOCKER_REPO/$WMS_IMG_NAME:$DOCKER_IMAGE_VERSION $WMS_IMG_NAME:$PORTAL_TAG +docker tag $NEXUS_DOCKER_REPO/$CLI_IMG_NAME:$CLI_DOCKER_VERSION $CLI_IMG_NAME:$PORTAL_TAG + +# Export variable for local logs directory, and create directory too +# The leading "./" is required for docker-compose +export LOGS_DIR=./logs +mkdir -p $LOGS_DIR + +# Export variable for subdirectory with appropriate property files +# The leading "./" is required for docker-compose +export PROPS_DIR=./properties_simpledemo # docker-compose is not in /usr/bin /opt/docker/docker-compose down /opt/docker/docker-compose up -d - diff --git a/boot/uui_vm_init.sh b/boot/uui_vm_init.sh index ebec9e3d..d02cf067 100755 --- a/boot/uui_vm_init.sh +++ b/boot/uui_vm_init.sh @@ -10,12 +10,12 @@ source /opt/config/onap_ips.txt # Refresh images docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO -docker pull $NEXUS_DOCKER_REPO/onap/uui/ui:$DOCKER_IMAGE_VERSION -docker pull $NEXUS_DOCKER_REPO/onap/uui/server:$DOCKER_IMAGE_VERSION +docker pull $NEXUS_DOCKER_REPO/onap/usecase-ui:$DOCKER_IMAGE_VERSION +docker pull $NEXUS_DOCKER_REPO/onap/usecase-ui/usecase-ui-server:$DOCKER_IMAGE_VERSION docker rm -f uui_ui docker rm -f uui_server # Insert docker run instructions here -docker run -i -t -d --name uui_ui -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/uui/ui:$DOCKER_IMAGE_VERSION -docker run -i -t -d --name uui_server -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/uui/server:$DOCKER_IMAGE_VERSION
\ No newline at end of file +docker run -i -t -d --name uui_ui -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/usecase-ui:$DOCKER_IMAGE_VERSION +docker run -i -t -d --name uui_server -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/usecase-ui/usecase-ui-server:$DOCKER_IMAGE_VERSION
\ No newline at end of file diff --git a/boot/vfc_vm_init.sh b/boot/vfc_vm_init.sh index 1d47e306..24f85cfa 100755 --- a/boot/vfc_vm_init.sh +++ b/boot/vfc_vm_init.sh @@ -10,6 +10,8 @@ source /opt/config/onap_ips.txt # Refresh images docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO +docker pull $NEXUS_DOCKER_REPO/onap/vfc/wfengine-activiti:$DOCKER_IMAGE_VERSION +docker pull $NEXUS_DOCKER_REPO/onap/vfc/wfengine-mgrservice:$DOCKER_IMAGE_VERSION docker pull $NEXUS_DOCKER_REPO/onap/vfc/catalog:$DOCKER_IMAGE_VERSION docker pull $NEXUS_DOCKER_REPO/onap/vfc/emsdriver:$DOCKER_IMAGE_VERSION docker pull $NEXUS_DOCKER_REPO/onap/vfc/gvnfmdriver:$DOCKER_IMAGE_VERSION @@ -24,6 +26,8 @@ docker pull $NEXUS_DOCKER_REPO/onap/vfc/ztesdncdriver:$DOCKER_IMAGE_VERSION docker pull $NEXUS_DOCKER_REPO/onap/vfc/ztevmanagerdriver:$DOCKER_IMAGE_VERSION docker pull $NEXUS_DOCKER_REPO/onap/vfc/nfvo/svnfm/nokia:$DOCKER_IMAGE_VERSION +docker rm -f vfc_wfengine_mgrservice +docker rm -f vfc_wfengine_activiti docker rm -f vfc_catalog docker rm -f vfc_emsdriver docker rm -f vfc_gvnfmdriver @@ -39,6 +43,8 @@ docker rm -f vfc_ztevmanagerdriver docker rm -f vfc_svnfm_nokia # Insert docker run instructions here +docker run -i -t -d --name vfc_wfengine_activiti -p 8804:8080 -e SERVICE_IP=$OPENO_IP -e SERVICE_PORT=8804 -e OPENPALETTE_MSB_IP=$OPENO_IP -e OPENPALETTE_MSB_PORT=80 $NEXUS_DOCKER_REPO/onap/vfc/wfengine-activiti:$DOCKER_IMAGE_VERSION +docker run -i -t -d --name vfc_wfengine_mgrservice -p 8805:10550 -e SERVICE_IP=$OPENO_IP -e SERVICE_PORT=8805 -e OPENPALETTE_MSB_IP=$OPENO_IP -e OPENPALETTE_MSB_PORT=80 $NEXUS_DOCKER_REPO/onap/vfc/wfengine-mgrservice:$DOCKER_IMAGE_VERSION docker run -i -t -d --name vfc_catalog -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/catalog:$DOCKER_IMAGE_VERSION docker run -i -t -d --name vfc_emsdriver -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/emsdriver:$DOCKER_IMAGE_VERSION docker run -i -t -d --name vfc_gvnfmdriver -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/gvnfmdriver:$DOCKER_IMAGE_VERSION |