From 66ec042963d37fba13794e7aadf39c4733ed573a Mon Sep 17 00:00:00 2001 From: Brian Freeman Date: Tue, 5 Jun 2018 14:40:08 -0500 Subject: Update for OOM DMaaP Port Issue-ID: INT-522 Change-Id: I7d29fee829312559554dd8c95b39dce1aabe0f3b Signed-off-by: Brian Freeman --- vnfs/vCPE/kea-sdnc-notify-mod/etc/kea-sdnc-notify.conf | 2 +- vnfs/vCPE/scripts/kea-sdnc-notify.conf | 2 +- vnfs/vCPE/scripts/v_dhcp_install.sh | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'vnfs') diff --git a/vnfs/vCPE/kea-sdnc-notify-mod/etc/kea-sdnc-notify.conf b/vnfs/vCPE/kea-sdnc-notify-mod/etc/kea-sdnc-notify.conf index 6fd09843..6085a636 100644 --- a/vnfs/vCPE/kea-sdnc-notify-mod/etc/kea-sdnc-notify.conf +++ b/vnfs/vCPE/kea-sdnc-notify-mod/etc/kea-sdnc-notify.conf @@ -1,4 +1,4 @@ { - "url": "http://DMAAP_IPADDR:3904/events/VCPE-DHCP-EVENT/", + "url": "http://DMAAP_IPADDR:DMAAP_IPPORT/events/VCPE-DHCP-EVENT/", "siaddr": "siaddr" } diff --git a/vnfs/vCPE/scripts/kea-sdnc-notify.conf b/vnfs/vCPE/scripts/kea-sdnc-notify.conf index 6fd09843..6085a636 100644 --- a/vnfs/vCPE/scripts/kea-sdnc-notify.conf +++ b/vnfs/vCPE/scripts/kea-sdnc-notify.conf @@ -1,4 +1,4 @@ { - "url": "http://DMAAP_IPADDR:3904/events/VCPE-DHCP-EVENT/", + "url": "http://DMAAP_IPADDR:DMAAP_IPPORT/events/VCPE-DHCP-EVENT/", "siaddr": "siaddr" } diff --git a/vnfs/vCPE/scripts/v_dhcp_install.sh b/vnfs/vCPE/scripts/v_dhcp_install.sh index f3697048..0365882d 100644 --- a/vnfs/vCPE/scripts/v_dhcp_install.sh +++ b/vnfs/vCPE/scripts/v_dhcp_install.sh @@ -6,6 +6,7 @@ DEMO_ARTIFACTS_VERSION=$(cat /opt/config/demo_artifacts_version.txt) INSTALL_SCRIPT_VERSION=$(cat /opt/config/install_script_version.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) MR_IP_ADDR=$(cat /opt/config/mr_ip_addr.txt) +MR_IP_PORT=$(cat /opt/config/mr_ip_port.txt) # Convert Network CIDR to Netmask cdr2mask () { @@ -81,6 +82,7 @@ update-rc.d v_dhcp.sh defaults cp kea-dhcp4.conf /etc/kea-dhcp4-server.conf mv kea-dhcp4.conf /etc/kea/kea-dhcp4.conf sed -i "s/DMAAP_IPADDR/"$MR_IP_ADDR"/g" kea-sdnc-notify.conf +sed -i "s/DMAAP_IPPORT/"$MR_IP_PORT"/g" kea-sdnc-notify.conf mv kea-sdnc-notify.conf /etc/kea/kea-sdnc-notify.conf sleep 1 @@ -107,4 +109,4 @@ then reboot fi -./v_dhcp_init.sh \ No newline at end of file +./v_dhcp_init.sh -- cgit 1.2.3-korg