diff options
| author |   Marco Platania <platania@research.att.com> | 2017-08-24 15:53:20 -0400 |
|---|---|---|
| committer | Marco Platania <platania@research.att.com> | 2017-08-24 15:53:20 -0400 |
| commit | 0fb5e3dba256af21c92e6f8b046b65f03d6a6b60 (patch) | |
| tree | fd036fe0b3a7c99113d0be055f2ae63805fe7e13 /heat/vCPE/infra | |
| parent | 6425289f2b983a1907d9d13e6751b2e4282b9f86 (diff) | |
Add Message Router IP address to vDHCP template
- Add MR IP to vCPE-Infra Heat template
- Modify kea-sdnc-notify.conf for Nexus
- Update v_dhcp_install.sh to change the fake MR IP via sed
Change-Id: I90faff7142739ca209ab2ad0efe9fd7a8d8dfe95
Issue-ID: UCA-35
Signed-off-by: Marco Platania <platania@research.att.com>
Diffstat (limited to 'heat/vCPE/infra')
| -rw-r--r-- | heat/vCPE/infra/base_vcpe_infra_rackspace.env | 1 | ||||
| -rw-r--r-- | heat/vCPE/infra/base_vcpe_infra_rackspace.yaml | 14 |
2 files changed, 11 insertions, 4 deletions
diff --git a/heat/vCPE/infra/base_vcpe_infra_rackspace.env b/heat/vCPE/infra/base_vcpe_infra_rackspace.env index 4de60903..790949bc 100644 --- a/heat/vCPE/infra/base_vcpe_infra_rackspace.env +++ b/heat/vCPE/infra/base_vcpe_infra_rackspace.env @@ -17,6 +17,7 @@ parameters: vdns_private_ip_1: 10.0.101.3 vweb_private_ip_0: 10.2.0.10 vweb_private_ip_1: 10.0.101.40 + mr_ip_addr: 10.0.11.1 vaaa_name_0: zdcpe1cpe01aaa01 vdns_name_0: zdcpe11cpe01dns01 vdhcp_name_0: zdcpe1cpe01dhcp01 diff --git a/heat/vCPE/infra/base_vcpe_infra_rackspace.yaml b/heat/vCPE/infra/base_vcpe_infra_rackspace.yaml index 6b9160bc..c0a18756 100644 --- a/heat/vCPE/infra/base_vcpe_infra_rackspace.yaml +++ b/heat/vCPE/infra/base_vcpe_infra_rackspace.yaml @@ -76,7 +76,7 @@ parameters: vaaa_private_ip_0: type: string label: vAAA private IP address towards the CPE_SIGNAL private network - description: Private IP address that is assigned to the vAAA to communicate with the vCPE components + description: Private IP address that is assigned to the vAAA to communicate with the vCPE components vaaa_private_ip_1: type: string label: vAAA private IP address towards the ONAP management network @@ -137,6 +137,10 @@ parameters: type: string label: DCAE collector port description: Port of the DCAE collector + mr_ip_addr: + type: string + label: Message Router IP address + description: IP address of the Message Router that for vDHCP configuration key_name: type: string label: Key pair name @@ -370,9 +374,10 @@ resources: str_replace: params: __oam_ipaddr__ : { get_param: vdhcp_private_ip_1 } - __cpe_signal_ipaddr__: { get_param: vdhcp_private_ip_0 } - __oam_cidr__: { get_param: onap_private_net_cidr } - __cpe_signal_net_cidr__: { get_param: cpe_signal_net_cidr } + __cpe_signal_ipaddr__ : { get_param: vdhcp_private_ip_0 } + __oam_cidr__ : { get_param: onap_private_net_cidr } + __cpe_signal_net_cidr__ : { get_param: cpe_signal_net_cidr } + __mr_ip_addr__ : { get_param: mr_ip_addr } __repo_url_blob__ : { get_param: repo_url_blob } __repo_url_artifacts__ : { get_param: repo_url_artifacts } __demo_artifacts_version__ : { get_param: demo_artifacts_version } @@ -387,6 +392,7 @@ resources: echo "__cpe_signal_ipaddr__" > /opt/config/cpe_signal_ipaddr.txt echo "__oam_cidr__" > /opt/config/oam_cidr.txt echo "__cpe_signal_net_cidr__" > /opt/config/cpe_signal_net_cidr.txt + echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt |