From 8332cbbf4e68f68a5927403be646c26ab9667fae Mon Sep 17 00:00:00 2001 From: Huang Haibin Date: Thu, 18 Oct 2018 15:35:33 +0800 Subject: Fix Tosca csar with error variable a. We don't define oam_private_net_cidr but define onap_private_net_cidr b. sdnc_ip change to sdnc_ip_addr c. define mr_ip_port for infra Change-Id: If8f1b3062d5f1c78881967c24b8d8dd32e197781 Issue-ID: INT-693 Signed-off-by: Huang Haibin --- tosca/vCPE/vbng/MainServiceTemplate_sriov.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tosca/vCPE/vbng/MainServiceTemplate_sriov.yaml') diff --git a/tosca/vCPE/vbng/MainServiceTemplate_sriov.yaml b/tosca/vCPE/vbng/MainServiceTemplate_sriov.yaml index 3e5f726b..2684899d 100644 --- a/tosca/vCPE/vbng/MainServiceTemplate_sriov.yaml +++ b/tosca/vCPE/vbng/MainServiceTemplate_sriov.yaml @@ -375,7 +375,7 @@ topology_template: cpe_signal_net_ipaddr: { get_input: vbng_private_ip_2 } bng_gmux_net_ipaddr: { get_input: vbng_private_ip_3 } oam_ipaddr: { get_input: vbng_private_ip_1 } - oam_cidr: { get_input: oam_private_net_cidr } + oam_cidr: { get_input: onap_private_net_cidr } bng_gmux_cidr: { get_input: bng_gmux_private_net_cidr } cpe_signal_cidr: { get_input: cpe_signal_private_net_cidr } brgemu_bng_cidr: { get_input: brgemu_bng_private_net_cidr } @@ -383,7 +383,7 @@ topology_template: dcae_collector_port: { get_input: dcae_collector_port } demo_artifacts_version: { get_input: demo_artifacts_version } install_script_version: { get_input: install_script_version } - sdnc_ip: { get_input: sdnc_ip } + sdnc_ip: { get_input: sdnc_ip_addr } cloud_env: { get_input: cloud_env } nexus_artifact_repo: { get_input: nexus_artifact_repo } user_data: | -- cgit 1.2.3-korg