diff options
Diffstat (limited to 'heat/vFW_NextGen/templates')
-rw-r--r-- | heat/vFW_NextGen/templates/vfw.yaml | 22 | ||||
-rw-r--r-- | heat/vFW_NextGen/templates/vpg.yaml | 16 | ||||
-rw-r--r-- | heat/vFW_NextGen/templates/vsn.yaml | 12 |
3 files changed, 25 insertions, 25 deletions
diff --git a/heat/vFW_NextGen/templates/vfw.yaml b/heat/vFW_NextGen/templates/vfw.yaml index 8e3e1bab..d7f83fd2 100644 --- a/heat/vFW_NextGen/templates/vfw.yaml +++ b/heat/vFW_NextGen/templates/vfw.yaml @@ -201,17 +201,17 @@ resources: user_data: str_replace: params: - __dcae_collector_ip__ : { get_param: dcae_collector_ip } - __dcae_collector_port__ : { get_param: dcae_collector_port } - __demo_artifacts_version__ : { get_param: demo_artifacts_version } - __install_script_version__ : { get_param: install_script_version } - __vfw_private_ip_0__ : { get_param: vfw_int_private1_ip_0 } - __vfw_private_ip_1__ : { get_param: vfw_int_private2_ip_0 } - __vfw_private_ip_2__ : { get_param: vfw_onap_private_ip_0 } - __unprotected_private_net_cidr__ : { get_param: int_private1_net_cidr } - __protected_private_net_cidr__ : { get_param: int_private2_net_cidr } - __onap_private_net_cidr__ : { get_param: onap_private_net_cidr } - __cloud_env__ : { get_param: cloud_env } + __dcae_collector_ip__: { get_param: dcae_collector_ip } + __dcae_collector_port__: { get_param: dcae_collector_port } + __demo_artifacts_version__: { get_param: demo_artifacts_version } + __install_script_version__: { get_param: install_script_version } + __vfw_private_ip_0__: { get_param: vfw_int_private1_ip_0 } + __vfw_private_ip_1__: { get_param: vfw_int_private2_ip_0 } + __vfw_private_ip_2__: { get_param: vfw_onap_private_ip_0 } + __unprotected_private_net_cidr__: { get_param: int_private1_net_cidr } + __protected_private_net_cidr__: { get_param: int_private2_net_cidr } + __onap_private_net_cidr__: { get_param: onap_private_net_cidr } + __cloud_env__: { get_param: cloud_env } __nexus_artifact_repo__: { get_param: nexus_artifact_repo } template: | #!/bin/bash diff --git a/heat/vFW_NextGen/templates/vpg.yaml b/heat/vFW_NextGen/templates/vpg.yaml index 6555aa7a..e1f82192 100644 --- a/heat/vFW_NextGen/templates/vpg.yaml +++ b/heat/vFW_NextGen/templates/vpg.yaml @@ -166,7 +166,7 @@ resources: - network: { get_param: public_net_id } - port: { get_resource: vpg_0_int_private1_port_0 } - port: { get_resource: vpg_0_onap_private_port_0 } - metadata: + metadata: vnf_name: { get_param: vnf_name } vnf_id: { get_param: vnf_id } vf_module_id: { get_param: vf_module_id } @@ -177,13 +177,13 @@ resources: __fw_ipaddr__: { get_param: vfw_int_private1_ip_0 } __protected_net_cidr__: { get_param: int_private2_net_cidr } __sink_ipaddr__: { get_param: vsn_int_private2_ip_0 } - __demo_artifacts_version__ : { get_param: demo_artifacts_version } - __install_script_version__ : { get_param: install_script_version } - __vpg_private_ip_0__ : { get_param: vpg_int_private1_ip_0 } - __vpg_private_ip_1__ : { get_param: vpg_onap_private_ip_0 } - __unprotected_private_net_cidr__ : { get_param: int_private1_net_cidr } - __onap_private_net_cidr__ : { get_param: onap_private_net_cidr } - __cloud_env__ : { get_param: cloud_env } + __demo_artifacts_version__: { get_param: demo_artifacts_version } + __install_script_version__: { get_param: install_script_version } + __vpg_private_ip_0__: { get_param: vpg_int_private1_ip_0 } + __vpg_private_ip_1__: { get_param: vpg_onap_private_ip_0 } + __unprotected_private_net_cidr__: { get_param: int_private1_net_cidr } + __onap_private_net_cidr__: { get_param: onap_private_net_cidr } + __cloud_env__: { get_param: cloud_env } __nexus_artifact_repo__: { get_param: nexus_artifact_repo } template: | #!/bin/bash diff --git a/heat/vFW_NextGen/templates/vsn.yaml b/heat/vFW_NextGen/templates/vsn.yaml index af12ec32..cdce5146 100644 --- a/heat/vFW_NextGen/templates/vsn.yaml +++ b/heat/vFW_NextGen/templates/vsn.yaml @@ -172,12 +172,12 @@ resources: params: __protected_net_gw__: { get_param: vfw_int_private2_ip_0 } __unprotected_net__: { get_param: int_private1_net_cidr } - __install_script_version__ : { get_param: install_script_version } - __vsn_private_ip_0__ : { get_param: vsn_int_private2_ip_0 } - __vsn_private_ip_1__ : { get_param: vsn_onap_private_ip_0 } - __protected_private_net_cidr__ : { get_param: int_private2_net_cidr } - __onap_private_net_cidr__ : { get_param: onap_private_net_cidr } - __cloud_env__ : { get_param: cloud_env } + __install_script_version__: { get_param: install_script_version } + __vsn_private_ip_0__: { get_param: vsn_int_private2_ip_0 } + __vsn_private_ip_1__: { get_param: vsn_onap_private_ip_0 } + __protected_private_net_cidr__: { get_param: int_private2_net_cidr } + __onap_private_net_cidr__: { get_param: onap_private_net_cidr } + __cloud_env__: { get_param: cloud_env } __nexus_artifact_repo__: { get_param: nexus_artifact_repo } template: | #!/bin/bash |