diff options
| -rw-r--r-- | boot/msb_vm_init.sh | 4 | ||||
| -rwxr-xr-x | boot/uui_vm_init.sh | 4 | ||||
| -rw-r--r-- | vnfs/vCPE/scripts/kea-dhcp4-web.conf | 63 | ||||
| -rw-r--r-- | vnfs/vCPE/scripts/v_web_init.sh | 1 | ||||
| -rw-r--r-- | vnfs/vCPE/scripts/v_web_install.sh | 15 |
5 files changed, 80 insertions, 7 deletions
diff --git a/boot/msb_vm_init.sh b/boot/msb_vm_init.sh index fbbb7c5f..41cfb433 100644 --- a/boot/msb_vm_init.sh +++ b/boot/msb_vm_init.sh @@ -128,7 +128,7 @@ curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "catalog", 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 -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" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "usecaseui-server", "version": "v1", "url": "/api/usecaseui/server/v1","protocol": "REST", "nodes": [ {"ip": "'$OPENO_IP'","port": "8082"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -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" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "usecaseui-ui", "version": "v1", "url": "/usecase-ui","path": "/iui/usecaseui","protocol": "UI", "nodes": [ {"ip": "'$OPENO_IP'","port": "8080"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" diff --git a/boot/uui_vm_init.sh b/boot/uui_vm_init.sh index d02cf067..4da5ce69 100755 --- a/boot/uui_vm_init.sh +++ b/boot/uui_vm_init.sh @@ -17,5 +17,5 @@ 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/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 +docker run -i -t -d --name uui_ui -p 8080:8080 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/usecase-ui:$DOCKER_IMAGE_VERSION +docker run -i -t -d --name uui_server -p 8082:8082 -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/vnfs/vCPE/scripts/kea-dhcp4-web.conf b/vnfs/vCPE/scripts/kea-dhcp4-web.conf new file mode 100644 index 00000000..4bf07044 --- /dev/null +++ b/vnfs/vCPE/scripts/kea-dhcp4-web.conf @@ -0,0 +1,63 @@ +{ +"Dhcp4": + { +# For testing, you can use veth pair as described in README.md +# vDHCP needs to lisetn on eth1 + "interfaces-config": { + "interfaces": ["eth1" ] + }, + +# How to load the hook library. + + "lease-database": { + "type": "memfile" + }, + + "expired-leases-processing": { + "reclaim-timer-wait-time": 10, + "flush-reclaimed-timer-wait-time": 25, + "hold-reclaimed-time": 3600, + "max-reclaim-leases": 100, + "max-reclaim-time": 250, + "unwarned-reclaim-cycles": 5 + }, + + "valid-lifetime": 3600, + +# Ensure you set some sensible defaults for the siaddr and option-data, +# otherwise the options won't be added at all. +# Also keep in mind that if kea doesn't receive the desired values for some +# reason, these values will be sent to the client. + "subnet4": [ + { "subnet": "10.2.0.0/24", + "pools" : [ { "pool": "10.2.0.2 - 10.2.0.255"} ], + "next-server": "10.2.0.1", + "option-data": [ + { + "name": "routers", + "data": "10.2.0.1" + } + ] + + } + ] + +}, + +"Logging": +{ + "loggers": [ + { + "name": "kea-dhcp4", + "output_options": [ + { + "output": "/var/log/kea-dhcp4.log" + } + ], + "severity": "DEBUG", + "debuglevel": 0 + }, + ] +} + +} diff --git a/vnfs/vCPE/scripts/v_web_init.sh b/vnfs/vCPE/scripts/v_web_init.sh index a9bf588e..fce6aaf6 100644 --- a/vnfs/vCPE/scripts/v_web_init.sh +++ b/vnfs/vCPE/scripts/v_web_init.sh @@ -1 +1,2 @@ #!/bin/bash +service kea-dhcp4-server start diff --git a/vnfs/vCPE/scripts/v_web_install.sh b/vnfs/vCPE/scripts/v_web_install.sh index e207dd09..685d675a 100644 --- a/vnfs/vCPE/scripts/v_web_install.sh +++ b/vnfs/vCPE/scripts/v_web_install.sh @@ -51,13 +51,22 @@ fi echo "deb http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list echo "deb-src http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list apt-get update -apt-get install --allow-unauthenticated -y wget openjdk-8-jdk apt-transport-https ca-certificates g++ libcurl4-gnutls-dev +apt-get install --allow-unauthenticated -y wget openjdk-8-jdk apt-transport-https ca-certificates kea-dhcp4-server g++ libcurl4-gnutls-dev sleep 1 -# Download DHCP config files +# Download DHCP config and init files cd /opt +wget $REPO_URL_BLOB/org.onap.demo/vnfs/vcpe/$INSTALL_SCRIPT_VERSION/kea-dhcp4-web.conf wget $REPO_URL_BLOB/org.onap.demo/vnfs/vcpe/$INSTALL_SCRIPT_VERSION/v_web_init.sh wget $REPO_URL_BLOB/org.onap.demo/vnfs/vcpe/$INSTALL_SCRIPT_VERSION/v_web.sh + + + +# Configure DHCP +cp kea-dhcp4-web.conf /etc/kea-dhcp4-server.conf +mv kea-dhcp4-web.conf /etc/kea/kea-dhcp4.conf + + chmod +x v_web_init.sh chmod +x v_web.sh mv v_web.sh /etc/init.d @@ -88,4 +97,4 @@ then reboot fi -./v_web_init.sh
\ No newline at end of file +./v_web_init.sh |