summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartek Grzybowski <b.grzybowski@partner.samsung.com>2020-03-26 14:23:02 +0100
committerBartek Grzybowski <b.grzybowski@partner.samsung.com>2020-03-26 14:23:02 +0100
commit314c0c1e45bc6a4c1ae0e7c030ebbf51b80abb35 (patch)
tree31fb09d3fb2fd0fbbf7d714075df6945b842c6f6
parent0f11467f0bf1d20212f94be2bbed75896b30d73f (diff)
Fix spacing issues in YAML files in heat
Fixes applied as reported by yamllint. Change-Id: I192de1f318c9aee58868807e4a9942b48b8b8e65 Issue-ID: INT-1482 Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
-rw-r--r--heat/vCPE/infra/base_vcpe_infra.yaml52
-rw-r--r--heat/vCPE/vbng/base_vcpe_vbng.yaml6
-rw-r--r--heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml8
-rw-r--r--heat/vCPE/vgmux/base_vcpe_vgmux.yaml22
-rw-r--r--heat/vCPE/vgw/base_vcpe_vgw.yaml15
-rw-r--r--heat/vCPE_build/vbng/build_vcpe_vbng.yaml14
-rw-r--r--heat/vCPE_build/vbrgemu/build_vcpe_vbrgemu.yaml20
-rw-r--r--heat/vCPE_build/vgmux/build_vcpe_vgmux.yaml22
-rw-r--r--heat/vCPE_build/vgw/build_vcpe_vgw.yaml19
-rw-r--r--heat/vFW/base_vfw.yaml50
-rw-r--r--heat/vFWCL/vFWSNK/base_vfw.yaml34
-rw-r--r--heat/vFWCL/vPKG/base_vpkg.yaml14
-rw-r--r--heat/vFWCL_arm64/vFWSNK/base_vfw.yaml34
-rw-r--r--heat/vFWCL_arm64/vPKG/base_vpkg.yaml14
-rwxr-xr-xheat/vFWDT/vFWSNK/base_vfw.yaml38
-rwxr-xr-xheat/vFWDT/vPKG/base_vpkg.yaml16
-rw-r--r--heat/vFW_CNF_CDS/templates/helm/base_template/templates/onap-private-net.yaml2
-rw-r--r--heat/vFW_CNF_CDS/templates/helm/base_template/templates/protected-private-net.yaml2
-rw-r--r--heat/vFW_CNF_CDS/templates/helm/base_template/templates/unprotected-private-net.yaml2
-rw-r--r--heat/vFW_CNF_CDS/templates/helm/vfw/templates/deployment.yaml2
-rw-r--r--heat/vFW_CNF_CDS/templates/helm/vpkg/templates/service.yaml2
-rw-r--r--heat/vFW_CNF_CDS/templates/helm/vsn/templates/deployment.yaml2
-rw-r--r--heat/vFW_CNF_CDS/templates/helm/vsn/templates/service.yaml4
-rw-r--r--heat/vFW_HPA/vFW/base_vfw.yaml48
-rw-r--r--heat/vFW_HPA/vFWCL/vFWSNK/base_vfw.yaml38
-rw-r--r--heat/vFW_HPA/vFWCL/vPKG/base_vpkg.yaml14
-rw-r--r--heat/vFW_HPA/vFW_SRIOV_NIC/base_vfw.yaml48
-rw-r--r--heat/vFW_NextGen/templates/vfw.yaml22
-rw-r--r--heat/vFW_NextGen/templates/vpg.yaml16
-rw-r--r--heat/vFW_NextGen/templates/vsn.yaml12
-rw-r--r--heat/vIPsec/vIPsec/base_vipsec.yaml70
-rw-r--r--heat/vLB/base_vlb.yaml6
-rw-r--r--heat/vLB/dnsscaling.yaml2
-rw-r--r--heat/vLB_CDS/base_template.yaml2
-rw-r--r--heat/vLB_CDS/vdns.yaml2
-rw-r--r--heat/vLB_CDS/vlb.yaml2
-rw-r--r--heat/vLB_CDS/vpkg.yaml2
-rw-r--r--heat/vLB_HPA/base_vlb.yaml6
-rw-r--r--heat/vLB_HPA/dnsscaling.yaml2
-rw-r--r--heat/vLB_HPA/vLB_SRIOV_NIC/base_vlb.yaml6
-rw-r--r--heat/vVG/base_vvg.yaml2
41 files changed, 346 insertions, 348 deletions
diff --git a/heat/vCPE/infra/base_vcpe_infra.yaml b/heat/vCPE/infra/base_vcpe_infra.yaml
index e6c9d82c..9d26bb67 100644
--- a/heat/vCPE/infra/base_vcpe_infra.yaml
+++ b/heat/vCPE/infra/base_vcpe_infra.yaml
@@ -1,7 +1,7 @@
##########################################################################
#
#==================LICENSE_START==========================================
-#
+#
#
# Copyright 2017 AT&T Intellectual Property. All rights reserved.
#
@@ -108,7 +108,7 @@ parameters:
vweb_private_ip_0:
type: string
label: vWEB private IP address towards the CPE_PUBLIC private network
- description: Private IP address that is assigned to the vWEB to communicate with the vGWs
+ description: Private IP address that is assigned to the vWEB to communicate with the vGWs
vweb_private_ip_1:
type: string
label: vWEB private IP address towards the ONAP management network
@@ -128,7 +128,7 @@ parameters:
vweb_name_0:
type: string
label: vWEB name
- description: Name of the vWEB
+ description: Name of the vWEB
vnf_id:
type: string
label: VNF ID
@@ -148,11 +148,11 @@ parameters:
mr_ip_addr:
type: string
label: Message Router IP address
- description: IP address of the Message Router that for vDHCP configuration
+ description: IP address of the Message Router that for vDHCP configuration
mr_ip_port:
type: string
- label: Message Router Port
- description: IP port of the Message Router that for vDHCP configuration
+ label: Message Router Port
+ description: IP port of the Message Router that for vDHCP configuration
key_name:
type: string
label: Key pair name
@@ -239,9 +239,9 @@ resources:
__oam_ipaddr__: { get_param: vaaa_private_ip_1 }
__oam_cidr__: { get_param: onap_private_net_cidr }
__cpe_signal_net_cidr__: { get_param: cpe_signal_net_cidr }
- __demo_artifacts_version__ : { get_param: demo_artifacts_version }
- __install_script_version__ : { get_param: install_script_version }
- __cloud_env__ : { get_param: cloud_env }
+ __demo_artifacts_version__: { get_param: demo_artifacts_version }
+ __install_script_version__: { get_param: install_script_version }
+ __cloud_env__: { get_param: cloud_env }
__nexus_artifact_repo__: { get_param: nexus_artifact_repo }
template: |
#!/bin/bash
@@ -299,13 +299,13 @@ resources:
user_data:
str_replace:
params:
- __oam_ipaddr__ : { get_param: vdns_private_ip_1 }
+ __oam_ipaddr__: { get_param: vdns_private_ip_1 }
__cpe_public_net_ipaddr__: { get_param: vdns_private_ip_0 }
__oam_cidr__: { get_param: onap_private_net_cidr }
__cpe_public_net_cidr__: { get_param: cpe_public_net_cidr }
- __demo_artifacts_version__ : { get_param: demo_artifacts_version }
- __install_script_version__ : { get_param: install_script_version }
- __cloud_env__ : { get_param: cloud_env }
+ __demo_artifacts_version__: { get_param: demo_artifacts_version }
+ __install_script_version__: { get_param: install_script_version }
+ __cloud_env__: { get_param: cloud_env }
__nexus_artifact_repo__: { get_param: nexus_artifact_repo }
template: |
#!/bin/bash
@@ -361,15 +361,15 @@ resources:
user_data:
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 }
- __mr_ip_addr__ : { get_param: mr_ip_addr }
- __mr_ip_port__ : { get_param: mr_ip_port }
- __demo_artifacts_version__ : { get_param: demo_artifacts_version }
- __install_script_version__ : { get_param: install_script_version }
- __cloud_env__ : { get_param: cloud_env }
+ __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 }
+ __mr_ip_addr__: { get_param: mr_ip_addr }
+ __mr_ip_port__: { get_param: mr_ip_port }
+ __demo_artifacts_version__: { get_param: demo_artifacts_version }
+ __install_script_version__: { get_param: install_script_version }
+ __cloud_env__: { get_param: cloud_env }
__nexus_artifact_repo__: { get_param: nexus_artifact_repo }
template: |
#!/bin/bash
@@ -427,13 +427,13 @@ resources:
user_data:
str_replace:
params:
- __oam_ipaddr__ : { get_param: vweb_private_ip_1 }
+ __oam_ipaddr__: { get_param: vweb_private_ip_1 }
__cpe_public_ipaddr__: { get_param: vweb_private_ip_0 }
__oam_cidr__: { get_param: onap_private_net_cidr }
__cpe_public_net_cidr__: { get_param: cpe_public_net_cidr }
- __demo_artifacts_version__ : { get_param: demo_artifacts_version }
- __install_script_version__ : { get_param: install_script_version }
- __cloud_env__ : { get_param: cloud_env }
+ __demo_artifacts_version__: { get_param: demo_artifacts_version }
+ __install_script_version__: { get_param: install_script_version }
+ __cloud_env__: { get_param: cloud_env }
__nexus_artifact_repo__: { get_param: nexus_artifact_repo }
template: |
#!/bin/bash
diff --git a/heat/vCPE/vbng/base_vcpe_vbng.yaml b/heat/vCPE/vbng/base_vcpe_vbng.yaml
index 7a12e5b6..e6a71343 100644
--- a/heat/vCPE/vbng/base_vcpe_vbng.yaml
+++ b/heat/vCPE/vbng/base_vcpe_vbng.yaml
@@ -237,9 +237,9 @@ resources:
__bng_gmux_cidr__: { get_param: bng_gmux_private_net_cidr }
__dcae_collector_ip__: { get_param: dcae_collector_ip }
__dcae_collector_port__: { get_param: dcae_collector_port }
- __demo_artifacts_version__ : { get_param: demo_artifacts_version }
- __script_version__ : { get_param: script_version }
- __cloud_env__ : { get_param: cloud_env }
+ __demo_artifacts_version__: { get_param: demo_artifacts_version }
+ __script_version__: { get_param: script_version }
+ __cloud_env__: { get_param: cloud_env }
__sdnc_ip_addr__: { get_param: sdnc_ip_addr }
__nexus_artifact_repo__: { get_param: nexus_artifact_repo }
template: |
diff --git a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml
index 2037a57b..3e3cd83e 100644
--- a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml
+++ b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml
@@ -188,10 +188,10 @@ resources:
# __brgemu_net_ipaddr__: { get_param: vbrgemu_private_ip_1 }
# __brgemu_cidr__: { get_param: vbrgemu_private_net_cidr }
__brgemu_bng_private_net_cidr__: { get_param: vbrgemu_bng_private_net_cidr }
- __demo_artifacts_version__ : { get_param: demo_artifacts_version }
- __script_version__ : { get_param: script_version }
- __cloud_env__ : { get_param: cloud_env }
- __sdnc_ip__ : { get_param: sdnc_ip }
+ __demo_artifacts_version__: { get_param: demo_artifacts_version }
+ __script_version__: { get_param: script_version }
+ __cloud_env__: { get_param: cloud_env }
+ __sdnc_ip__: { get_param: sdnc_ip }
__nexus_artifact_repo__: { get_param: nexus_artifact_repo }
template: |
#!/bin/bash
diff --git a/heat/vCPE/vgmux/base_vcpe_vgmux.yaml b/heat/vCPE/vgmux/base_vcpe_vgmux.yaml
index f8db87b2..5b9ce8ec 100644
--- a/heat/vCPE/vgmux/base_vcpe_vgmux.yaml
+++ b/heat/vCPE/vgmux/base_vcpe_vgmux.yaml
@@ -185,7 +185,7 @@ resources:
type: OS::Neutron::Port
properties:
network: { get_param: mux_gw_private_net_id }
- fixed_ips: [{"subnet": { get_param: mux_gw_private_subnet_id }, "ip_address": { get_param: vgmux_private_ip_2 }}]
+ fixed_ips: [{"subnet": { get_param: mux_gw_private_subnet_id }, "ip_address": { get_param: vgmux_private_ip_2 }}]
vgmux_0:
type: OS::Nova::Server
@@ -204,16 +204,16 @@ resources:
user_data:
str_replace:
params:
- __mux_to_bng_net_ipaddr__ : { get_param: vgmux_private_ip_0 }
- __oam_ipaddr__ : { get_param: vgmux_private_ip_1 }
- __mux_gw_net_ipaddr__ : { get_param: vgmux_private_ip_2 }
- __bng_to_mux_ipaddr__ : { get_param: bng_gmux_private_ip }
- __bng_mux_net_cidr__ : { get_param: bng_gmux_private_net_cidr }
- __oam_cidr__ : { get_param: onap_private_net_cidr }
- __mux_gw_net_cidr__ : { get_param: mux_gw_private_net_cidr }
- __brg_bng_net_cidr__ : { get_param: brgemu_bng_private_net_cidr }
- __script_version__ : { get_param: script_version }
- __cloud_env__ : { get_param: cloud_env }
+ __mux_to_bng_net_ipaddr__: { get_param: vgmux_private_ip_0 }
+ __oam_ipaddr__: { get_param: vgmux_private_ip_1 }
+ __mux_gw_net_ipaddr__: { get_param: vgmux_private_ip_2 }
+ __bng_to_mux_ipaddr__: { get_param: bng_gmux_private_ip }
+ __bng_mux_net_cidr__: { get_param: bng_gmux_private_net_cidr }
+ __oam_cidr__: { get_param: onap_private_net_cidr }
+ __mux_gw_net_cidr__: { get_param: mux_gw_private_net_cidr }
+ __brg_bng_net_cidr__: { get_param: brgemu_bng_private_net_cidr }
+ __script_version__: { get_param: script_version }
+ __cloud_env__: { get_param: cloud_env }
__nexus_artifact_repo__: { get_param: nexus_artifact_repo }
template: |
#!/bin/bash
diff --git a/heat/vCPE/vgw/base_vcpe_vgw.yaml b/heat/vCPE/vgw/base_vcpe_vgw.yaml
index 74fa490b..50cb44c1 100644
--- a/heat/vCPE/vgw/base_vcpe_vgw.yaml
+++ b/heat/vCPE/vgw/base_vcpe_vgw.yaml
@@ -205,13 +205,13 @@ resources:
user_data:
str_replace:
params:
- __mux_gw_private_net_ipaddr__ : { get_param: vgw_private_ip_0 }
- __oam_ipaddr__ : { get_param: vgw_private_ip_1 }
- __oam_cidr__ : { get_param: onap_private_net_cidr }
- __cpe_public_net_cidr__ : { get_param: cpe_public_net_cidr }
- __mux_gw_private_net_cidr__ : { get_param: mux_gw_private_net_cidr }
- __script_version__ : { get_param: script_version }
- __cloud_env__ : { get_param: cloud_env }
+ __mux_gw_private_net_ipaddr__: { get_param: vgw_private_ip_0 }
+ __oam_ipaddr__: { get_param: vgw_private_ip_1 }
+ __oam_cidr__: { get_param: onap_private_net_cidr }
+ __cpe_public_net_cidr__: { get_param: cpe_public_net_cidr }
+ __mux_gw_private_net_cidr__: { get_param: mux_gw_private_net_cidr }
+ __script_version__: { get_param: script_version }
+ __cloud_env__: { get_param: cloud_env }
__mux_ip_addr__: { get_param: mux_ip_addr }
__vg_vgmux_tunnel_vni__: { get_param: vg_vgmux_tunnel_vni }
__nexus_artifact_repo__: { get_param: nexus_artifact_repo }
@@ -240,4 +240,3 @@ resources:
cd /opt
chmod +x v_gw_install.sh
./v_gw_install.sh
-
diff --git a/heat/vCPE_build/vbng/build_vcpe_vbng.yaml b/heat/vCPE_build/vbng/build_vcpe_vbng.yaml
index 85b2aac2..ef3e8c87 100644
--- a/heat/vCPE_build/vbng/build_vcpe_vbng.yaml
+++ b/heat/vCPE_build/vbng/build_vcpe_vbng.yaml
@@ -139,13 +139,13 @@ resources:
user_data:
str_replace:
params:
- __demo_artifacts_version__ : { get_param: demo_artifacts_version }
- __script_version__ : { get_param: script_version }
- __cloud_env__ : { get_param: cloud_env }
- __vpp_source_repo_url__ : { get_param: vpp_source_repo_url }
- __vpp_source_repo_release_tag__ : { get_param: vpp_source_repo_release_tag }
- __vpp_patch_url__ : { get_param: vpp_patch_url }
- __compile_state__ : { get_param: compile_state }
+ __demo_artifacts_version__: { get_param: demo_artifacts_version }
+ __script_version__: { get_param: script_version }
+ __cloud_env__: { get_param: cloud_env }
+ __vpp_source_repo_url__: { get_param: vpp_source_repo_url }
+ __vpp_source_repo_release_tag__: { get_param: vpp_source_repo_release_tag }
+ __vpp_patch_url__: { get_param: vpp_patch_url }
+ __compile_state__: { get_param: compile_state }
__nexus_artifact_repo__: { get_param: nexus_artifact_repo }
template: |
#!/bin/bash
diff --git a/heat/vCPE_build/vbrgemu/build_vcpe_vbrgemu.yaml b/heat/vCPE_build/vbrgemu/build_vcpe_vbrgemu.yaml
index d3d8a4fc..028459dd 100644
--- a/heat/vCPE_build/vbrgemu/build_vcpe_vbrgemu.yaml
+++ b/heat/vCPE_build/vbrgemu/build_vcpe_vbrgemu.yaml
@@ -108,7 +108,7 @@ parameters:
label: Compile State
description: State to compile code or not; included for backwards compatibility
default: "done"
-
+
#############
# #
# RESOURCES #
@@ -148,15 +148,15 @@ resources:
user_data:
str_replace:
params:
- __demo_artifacts_version__ : { get_param: demo_artifacts_version }
- __script_version__ : { get_param: script_version }
- __cloud_env__ : { get_param: cloud_env }
- __vpp_source_repo_url__ : { get_param: vpp_source_repo_url }
- __vpp_source_repo_release_tag__ : { get_param: vpp_source_repo_release_tag }
- __hc2vpp_source_repo_url__ : { get_param: hc2vpp_source_repo_url }
- __hc2vpp_source_repo_release_tag__ : { get_param: hc2vpp_source_repo_release_tag }
- __vpp_patch_url__ : { get_param: vpp_patch_url }
- __compile_state__ : { get_param: compile_state }
+ __demo_artifacts_version__: { get_param: demo_artifacts_version }
+ __script_version__: { get_param: script_version }
+ __cloud_env__: { get_param: cloud_env }
+ __vpp_source_repo_url__: { get_param: vpp_source_repo_url }
+ __vpp_source_repo_release_tag__: { get_param: vpp_source_repo_release_tag }
+ __hc2vpp_source_repo_url__: { get_param: hc2vpp_source_repo_url }
+ __hc2vpp_source_repo_release_tag__: { get_param: hc2vpp_source_repo_release_tag }
+ __vpp_patch_url__: { get_param: vpp_patch_url }
+ __compile_state__: { get_param: compile_state }
__nexus_artifact_repo__: { get_param: nexus_artifact_repo }
template: |
#!/bin/bash
diff --git a/heat/vCPE_build/vgmux/build_vcpe_vgmux.yaml b/heat/vCPE_build/vgmux/build_vcpe_vgmux.yaml
index 8b11e48d..485bd0b9 100644
--- a/heat/vCPE_build/vgmux/build_vcpe_vgmux.yaml
+++ b/heat/vCPE_build/vgmux/build_vcpe_vgmux.yaml
@@ -165,18 +165,18 @@ resources:
user_data:
str_replace:
params:
- __demo_artifacts_version__ : { get_param: demo_artifacts_version }
- __script_version__ : { get_param: script_version }
- __cloud_env__ : { get_param: cloud_env }
- __vpp_source_repo_url__ : { get_param: vpp_source_repo_url }
- __vpp_source_repo_release_tag__ : { get_param: vpp_source_repo_release_tag }
- __hc2vpp_source_repo_url__ : { get_param: hc2vpp_source_repo_url }
- __hc2vpp_source_repo_release_tag__ : { get_param: hc2vpp_source_repo_release_tag }
- __vpp_patch_url__ : { get_param: vpp_patch_url }
- __hc2vpp_patch_url__ : { get_param: hc2vpp_patch_url }
- __libevel_patch_url__ : { get_param: libevel_patch_url }
+ __demo_artifacts_version__: { get_param: demo_artifacts_version }
+ __script_version__: { get_param: script_version }
+ __cloud_env__: { get_param: cloud_env }
+ __vpp_source_repo_url__: { get_param: vpp_source_repo_url }
+ __vpp_source_repo_release_tag__: { get_param: vpp_source_repo_release_tag }
+ __hc2vpp_source_repo_url__: { get_param: hc2vpp_source_repo_url }
+ __hc2vpp_source_repo_release_tag__: { get_param: hc2vpp_source_repo_release_tag }
+ __vpp_patch_url__: { get_param: vpp_patch_url }
+ __hc2vpp_patch_url__: { get_param: hc2vpp_patch_url }
+ __libevel_patch_url__: { get_param: libevel_patch_url }
__nexus_artifact_repo__: { get_param: nexus_artifact_repo }
- __compile_state__ : {get_param : compile_state}
+ __compile_state__: {get_param: compile_state}
template: |
#!/bin/bash
diff --git a/heat/vCPE_build/vgw/build_vcpe_vgw.yaml b/heat/vCPE_build/vgw/build_vcpe_vgw.yaml
index 3660f62c..84c4d812 100644
--- a/heat/vCPE_build/vgw/build_vcpe_vgw.yaml
+++ b/heat/vCPE_build/vgw/build_vcpe_vgw.yaml
@@ -147,21 +147,21 @@ resources:
name: { get_param: vgw_name_0 }
key_name: { get_resource: my_keypair }
networks:
- - network: { get_param: public_net_id }
+ - network: { get_param: public_net_id }
metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}
user_data_format: RAW
user_data:
str_replace:
params:
- __demo_artifacts_version__ : { get_param: demo_artifacts_version }
- __script_version__ : { get_param: script_version }
- __cloud_env__ : { get_param: cloud_env }
- __vpp_source_repo_url__ : { get_param: vpp_source_repo_url }
- __vpp_source_repo_release_tag__ : { get_param: vpp_source_repo_release_tag }
- __hc2vpp_source_repo_url__ : { get_param: hc2vpp_source_repo_url }
- __hc2vpp_source_repo_release_tag__ : { get_param: hc2vpp_source_repo_release_tag }
+ __demo_artifacts_version__: { get_param: demo_artifacts_version }
+ __script_version__: { get_param: script_version }
+ __cloud_env__: { get_param: cloud_env }
+ __vpp_source_repo_url__: { get_param: vpp_source_repo_url }
+ __vpp_source_repo_release_tag__: { get_param: vpp_source_repo_release_tag }
+ __hc2vpp_source_repo_url__: { get_param: hc2vpp_source_repo_url }
+ __hc2vpp_source_repo_release_tag__: { get_param: hc2vpp_source_repo_release_tag }
__nexus_artifact_repo__: { get_param: nexus_artifact_repo }
- __compile_state__ : {get_param : compile_state}
+ __compile_state__: {get_param: compile_state}
template: |
#!/bin/bash
@@ -186,4 +186,3 @@ resources:
cd /opt
chmod +x v_gw_build.sh
./v_gw_build.sh
-
diff --git a/heat/vFW/base_vfw.yaml b/heat/vFW/base_vfw.yaml
index 6137e8ab..5ac182dd 100644
--- a/heat/vFW/base_vfw.yaml
+++ b/heat/vFW/base_vfw.yaml
@@ -103,7 +103,7 @@ parameters:
description: Private IP address that is assigned to the vFirewall to communicate with ONAP components
vfw_int_protected_private_floating_ip:
type: string
- label: same value as vpg_int_unprotected_private_ip_0
+ label: same value as vpg_int_unprotected_private_ip_0
description: IP to inform OpenStack to enable vfw protected private port to allow packets coming from the packet generator
vpg_int_unprotected_private_ip_0:
type: string
@@ -302,17 +302,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_unprotected_private_ip_0 }
- __vfw_private_ip_1__ : { get_param: vfw_int_protected_private_ip_0 }
- __vfw_private_ip_2__ : { get_param: vfw_onap_private_ip_0 }
- __unprotected_private_net_cidr__ : { get_param: unprotected_private_net_cidr }
- __protected_private_net_cidr__ : { get_param: protected_private_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_unprotected_private_ip_0 }
+ __vfw_private_ip_1__: { get_param: vfw_int_protected_private_ip_0 }
+ __vfw_private_ip_2__: { get_param: vfw_onap_private_ip_0 }
+ __unprotected_private_net_cidr__: { get_param: unprotected_private_net_cidr }
+ __protected_private_net_cidr__: { get_param: protected_private_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
@@ -383,13 +383,13 @@ resources:
__fw_ipaddr__: { get_param: vfw_int_unprotected_private_ip_0 }
__protected_net_cidr__: { get_param: protected_private_net_cidr }
__sink_ipaddr__: { get_param: vsn_int_protected_private_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_unprotected_private_ip_0 }
- __vpg_private_ip_1__ : { get_param: vpg_onap_private_ip_0 }
- __unprotected_private_net_cidr__ : { get_param: unprotected_private_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_unprotected_private_ip_0 }
+ __vpg_private_ip_1__: { get_param: vpg_onap_private_ip_0 }
+ __unprotected_private_net_cidr__: { get_param: unprotected_private_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
@@ -458,12 +458,12 @@ resources:
params:
__protected_net_gw__: { get_param: vfw_int_protected_private_ip_0 }
__unprotected_net__: { get_param: unprotected_private_net_cidr }
- __install_script_version__ : { get_param: install_script_version }
- __vsn_private_ip_0__ : { get_param: vsn_int_protected_private_ip_0 }
- __vsn_private_ip_1__ : { get_param: vsn_onap_private_ip_0 }
- __protected_private_net_cidr__ : { get_param: protected_private_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_protected_private_ip_0 }
+ __vsn_private_ip_1__: { get_param: vsn_onap_private_ip_0 }
+ __protected_private_net_cidr__: { get_param: protected_private_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/vFWCL/vFWSNK/base_vfw.yaml b/heat/vFWCL/vFWSNK/base_vfw.yaml
index a11d4b41..0f9e59d2 100644
--- a/heat/vFWCL/vFWSNK/base_vfw.yaml
+++ b/heat/vFWCL/vFWSNK/base_vfw.yaml
@@ -287,17 +287,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_unprotected_private_ip_0 }
- __vfw_private_ip_1__ : { get_param: vfw_int_protected_private_ip_0 }
- __vfw_private_ip_2__ : { get_param: vfw_onap_private_ip_0 }
- __unprotected_private_net_cidr__ : { get_param: unprotected_private_net_cidr }
- __protected_private_net_cidr__ : { get_param: protected_private_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_unprotected_private_ip_0 }
+ __vfw_private_ip_1__: { get_param: vfw_int_protected_private_ip_0 }
+ __vfw_private_ip_2__: { get_param: vfw_onap_private_ip_0 }
+ __unprotected_private_net_cidr__: { get_param: unprotected_private_net_cidr }
+ __protected_private_net_cidr__: { get_param: protected_private_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
@@ -366,12 +366,12 @@ resources:
params:
__protected_net_gw__: { get_param: vfw_int_protected_private_ip_0 }
__unprotected_net__: { get_param: unprotected_private_net_cidr }
- __install_script_version__ : { get_param: install_script_version }
- __vsn_private_ip_0__ : { get_param: vsn_int_protected_private_ip_0 }
- __vsn_private_ip_1__ : { get_param: vsn_onap_private_ip_0 }
- __protected_private_net_cidr__ : { get_param: protected_private_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_protected_private_ip_0 }
+ __vsn_private_ip_1__: { get_param: vsn_onap_private_ip_0 }
+ __protected_private_net_cidr__: { get_param: protected_private_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/vFWCL/vPKG/base_vpkg.yaml b/heat/vFWCL/vPKG/base_vpkg.yaml
index 70c5e017..032001c1 100644
--- a/heat/vFWCL/vPKG/base_vpkg.yaml
+++ b/heat/vFWCL/vPKG/base_vpkg.yaml
@@ -197,13 +197,13 @@ resources:
__fw_ipaddr__: { get_param: vfw_private_ip_0 }
__protected_net_cidr__: { get_param: protected_private_net_cidr }
__sink_ipaddr__: { get_param: vsn_private_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_unprotected_private_ip_0 }
- __vpg_private_ip_1__ : { get_param: vpg_onap_private_ip_0 }
- __unprotected_private_net_cidr__ : { get_param: unprotected_private_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_unprotected_private_ip_0 }
+ __vpg_private_ip_1__: { get_param: vpg_onap_private_ip_0 }
+ __unprotected_private_net_cidr__: { get_param: unprotected_private_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/vFWCL_arm64/vFWSNK/base_vfw.yaml b/heat/vFWCL_arm64/vFWSNK/base_vfw.yaml
index d30a64fc..a3205ff6 100644
--- a/heat/vFWCL_arm64/vFWSNK/base_vfw.yaml
+++ b/heat/vFWCL_arm64/vFWSNK/base_vfw.yaml
@@ -283,17 +283,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_unprotected_private_ip_0 }
- __vfw_private_ip_1__ : { get_param: vfw_int_protected_private_ip_0 }
- __vfw_private_ip_2__ : { get_param: vfw_onap_private_ip_0 }
- __unprotected_private_net_cidr__ : { get_param: unprotected_private_net_cidr }
- __protected_private_net_cidr__ : { get_param: protected_private_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_unprotected_private_ip_0 }
+ __vfw_private_ip_1__: { get_param: vfw_int_protected_private_ip_0 }
+ __vfw_private_ip_2__: { get_param: vfw_onap_private_ip_0 }
+ __unprotected_private_net_cidr__: { get_param: unprotected_private_net_cidr }
+ __protected_private_net_cidr__: { get_param: protected_private_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
@@ -362,12 +362,12 @@ resources:
params:
__protected_net_gw__: { get_param: vfw_int_protected_private_ip_0 }
__unprotected_net__: { get_param: unprotected_private_net_cidr }
- __install_script_version__ : { get_param: install_script_version }
- __vsn_private_ip_0__ : { get_param: vsn_int_protected_private_ip_0 }
- __vsn_private_ip_1__ : { get_param: vsn_onap_private_ip_0 }
- __protected_private_net_cidr__ : { get_param: protected_private_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_protected_private_ip_0 }
+ __vsn_private_ip_1__: { get_param: vsn_onap_private_ip_0 }
+ __protected_private_net_cidr__: { get_param: protected_private_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/vFWCL_arm64/vPKG/base_vpkg.yaml b/heat/vFWCL_arm64/vPKG/base_vpkg.yaml
index 2a3c36d1..6fbd1a14 100644
--- a/heat/vFWCL_arm64/vPKG/base_vpkg.yaml
+++ b/heat/vFWCL_arm64/vPKG/base_vpkg.yaml
@@ -197,13 +197,13 @@ resources:
__fw_ipaddr__: { get_param: vfw_private_ip_0 }
__protected_net_cidr__: { get_param: protected_private_net_cidr }
__sink_ipaddr__: { get_param: vsn_private_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_unprotected_private_ip_0 }
- __vpg_private_ip_1__ : { get_param: vpg_onap_private_ip_0 }
- __unprotected_private_net_cidr__ : { get_param: unprotected_private_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_unprotected_private_ip_0 }
+ __vpg_private_ip_1__: { get_param: vpg_onap_private_ip_0 }
+ __unprotected_private_net_cidr__: { get_param: unprotected_private_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/vFWDT/vFWSNK/base_vfw.yaml b/heat/vFWDT/vFWSNK/base_vfw.yaml
index 4c84212f..770f659e 100755
--- a/heat/vFWDT/vFWSNK/base_vfw.yaml
+++ b/heat/vFWDT/vFWSNK/base_vfw.yaml
@@ -258,19 +258,19 @@ 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_private_ip_0 }
- __vfw_private_ip_1__ : { get_param: vfw_private_ip_1 }
- __vfw_private_ip_2__ : { get_param: vfw_private_ip_2 }
- __vfw_private_ip_3__ : { get_param: vfw_private_ip_3 }
- __unprotected_private_net_cidr__ : { get_param: unprotected_private_net_cidr }
- __protected_private_net_cidr__ : { get_param: protected_private_net_cidr }
- __onap_private_net_cidr__ : { get_param: onap_private_net_cidr }
+ __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_private_ip_0 }
+ __vfw_private_ip_1__: { get_param: vfw_private_ip_1 }
+ __vfw_private_ip_2__: { get_param: vfw_private_ip_2 }
+ __vfw_private_ip_3__: { get_param: vfw_private_ip_3 }
+ __unprotected_private_net_cidr__: { get_param: unprotected_private_net_cidr }
+ __protected_private_net_cidr__: { get_param: protected_private_net_cidr }
+ __onap_private_net_cidr__: { get_param: onap_private_net_cidr }
__nexus_artifact_repo__: { get_param: nexus_artifact_repo }
- __cloud_env__ : { get_param: cloud_env }
+ __cloud_env__: { get_param: cloud_env }
template: |
#!/bin/bash
@@ -350,14 +350,14 @@ resources:
params:
__protected_net_gw__: { get_param: vfw_private_ip_1 }
__unprotected_net__: { get_param: unprotected_private_net_cidr }
- __install_script_version__ : { get_param: install_script_version }
- __vsn_private_ip_0__ : { get_param: vsn_private_ip_0 }
- __vsn_private_ip_1__ : { get_param: vsn_private_ip_1 }
- __vsn_private_ip_2__ : { get_param: vsn_private_ip_2 }
- __protected_private_net_cidr__ : { get_param: protected_private_net_cidr }
- __onap_private_net_cidr__ : { get_param: onap_private_net_cidr }
+ __install_script_version__: { get_param: install_script_version }
+ __vsn_private_ip_0__: { get_param: vsn_private_ip_0 }
+ __vsn_private_ip_1__: { get_param: vsn_private_ip_1 }
+ __vsn_private_ip_2__: { get_param: vsn_private_ip_2 }
+ __protected_private_net_cidr__: { get_param: protected_private_net_cidr }
+ __onap_private_net_cidr__: { get_param: onap_private_net_cidr }
__nexus_artifact_repo__: { get_param: nexus_artifact_repo }
- __cloud_env__ : { get_param: cloud_env }
+ __cloud_env__: { get_param: cloud_env }
template: |
#!/bin/bash
diff --git a/heat/vFWDT/vPKG/base_vpkg.yaml b/heat/vFWDT/vPKG/base_vpkg.yaml
index 75e7c7a7..77721788 100755
--- a/heat/vFWDT/vPKG/base_vpkg.yaml
+++ b/heat/vFWDT/vPKG/base_vpkg.yaml
@@ -252,15 +252,15 @@ resources:
__fw_ipaddr__: { get_param: vfw_private_ip_0 }
__protected_net_cidr__: { get_param: protected_private_net_cidr }
__sink_ipaddr__: { get_param: vsn_private_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_private_ip_0 }
- __vpg_private_ip_1__ : { get_param: vpg_private_ip_1 }
- __vpg_private_ip_2__ : { get_param: vpg_private_ip_2 }
- __unprotected_private_net_cidr__ : { get_param: unprotected_private_net_cidr }
- __onap_private_net_cidr__ : { get_param: onap_private_net_cidr }
+ __demo_artifacts_version__: { get_param: demo_artifacts_version }
+ __install_script_version__: { get_param: install_script_version }
+ __vpg_private_ip_0__: { get_param: vpg_private_ip_0 }
+ __vpg_private_ip_1__: { get_param: vpg_private_ip_1 }
+ __vpg_private_ip_2__: { get_param: vpg_private_ip_2 }
+ __unprotected_private_net_cidr__: { get_param: unprotected_private_net_cidr }
+ __onap_private_net_cidr__: { get_param: onap_private_net_cidr }
__nexus_artifact_repo__: { get_param: nexus_artifact_repo }
- __cloud_env__ : { get_param: cloud_env }
+ __cloud_env__: { get_param: cloud_env }
template: |
#!/bin/bash
diff --git a/heat/vFW_CNF_CDS/templates/helm/base_template/templates/onap-private-net.yaml b/heat/vFW_CNF_CDS/templates/helm/base_template/templates/onap-private-net.yaml
index 1b9423f6..03a73104 100644
--- a/heat/vFW_CNF_CDS/templates/helm/base_template/templates/onap-private-net.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/base_template/templates/onap-private-net.yaml
@@ -7,7 +7,7 @@ metadata:
release: {{ .Release.Name }}
chart: {{ .Chart.Name }}
spec:
- cniType : ovn4nfv
+ cniType: ovn4nfv
ipv4Subnets:
- name: {{ .Values.onap_private_subnet_id }}
subnet: {{ .Values.onap_private_net_cidr }}
diff --git a/heat/vFW_CNF_CDS/templates/helm/base_template/templates/protected-private-net.yaml b/heat/vFW_CNF_CDS/templates/helm/base_template/templates/protected-private-net.yaml
index 6b939d2a..5c4144e1 100644
--- a/heat/vFW_CNF_CDS/templates/helm/base_template/templates/protected-private-net.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/base_template/templates/protected-private-net.yaml
@@ -7,7 +7,7 @@ metadata:
release: {{ .Release.Name }}
chart: {{ .Chart.Name }}
spec:
- cniType : ovn4nfv
+ cniType: ovn4nfv
ipv4Subnets:
- name: {{ .Values.int_private2_subnet_id }}
subnet: {{ .Values.int_private2_net_cidr }}
diff --git a/heat/vFW_CNF_CDS/templates/helm/base_template/templates/unprotected-private-net.yaml b/heat/vFW_CNF_CDS/templates/helm/base_template/templates/unprotected-private-net.yaml
index db2a5b32..dc6f151e 100644
--- a/heat/vFW_CNF_CDS/templates/helm/base_template/templates/unprotected-private-net.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/base_template/templates/unprotected-private-net.yaml
@@ -7,7 +7,7 @@ metadata:
release: {{ .Release.Name }}
chart: {{ .Chart.Name }}
spec:
- cniType : ovn4nfv
+ cniType: ovn4nfv
ipv4Subnets:
- name: {{ .Values.int_private1_subnet_id }}
subnet: {{ .Values.int_private1_net_cidr }}
diff --git a/heat/vFW_CNF_CDS/templates/helm/vfw/templates/deployment.yaml b/heat/vFW_CNF_CDS/templates/helm/vfw/templates/deployment.yaml
index 2205cf89..1f535e7f 100644
--- a/heat/vFW_CNF_CDS/templates/helm/vfw/templates/deployment.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vfw/templates/deployment.yaml
@@ -39,7 +39,7 @@ spec:
- bash -c 'set -a; . /etc/cloud/environment; bash firewall.sh'
VirtletRootVolumeSize: 5Gi
k8s.v1.cni.cncf.io/networks: "{{ .Values.net_attachment_definition }}"
- k8s.plugin.opnfv.org/nfn-network: |
+ k8s.plugin.opnfv.org/nfn-network: |
{ "type": "ovn4nfv",
"interface": [
{ "name": {{ .Values.int_private1_net_id | quote }},
diff --git a/heat/vFW_CNF_CDS/templates/helm/vpkg/templates/service.yaml b/heat/vFW_CNF_CDS/templates/helm/vpkg/templates/service.yaml
index 84a7d1a0..7d2ecc13 100644
--- a/heat/vFW_CNF_CDS/templates/helm/vpkg/templates/service.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vpkg/templates/service.yaml
@@ -10,7 +10,7 @@ metadata:
spec:
type: {{ .Values.service.type }}
ports:
- - port: {{ .Values.service.ports.port }}
+ - port: {{ .Values.service.ports.port }}
nodePort: {{ .Values.service.ports.nodePort }}
selector:
vf-module-name: {{ .Values.vpg_name_0 }}
diff --git a/heat/vFW_CNF_CDS/templates/helm/vsn/templates/deployment.yaml b/heat/vFW_CNF_CDS/templates/helm/vsn/templates/deployment.yaml
index 6f45ed4a..6d5fd985 100644
--- a/heat/vFW_CNF_CDS/templates/helm/vsn/templates/deployment.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vsn/templates/deployment.yaml
@@ -48,7 +48,7 @@ spec:
securityContext:
privileged: true
- name: darkstat
- image: "{{ .Values.image.darkstatrepo }}:{{ .Values.image.darkstattag }}"
+ image: "{{ .Values.image.darkstatrepo }}:{{ .Values.image.darkstattag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
tty: true
stdin: true
diff --git a/heat/vFW_CNF_CDS/templates/helm/vsn/templates/service.yaml b/heat/vFW_CNF_CDS/templates/helm/vsn/templates/service.yaml
index 7c51d4ff..e93a8c9a 100644
--- a/heat/vFW_CNF_CDS/templates/helm/vsn/templates/service.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vsn/templates/service.yaml
@@ -10,8 +10,8 @@ metadata:
spec:
type: {{ .Values.service.type }}
ports:
- - port: {{ .Values.service.ports.port }}
- nodePort: {{ .Values.service.ports.nodePort }}
+ - port: {{ .Values.service.ports.port }}
+ nodePort: {{ .Values.service.ports.nodePort }}
selector:
vf-module-name: {{ .Values.vsn_name_0 }}
release: {{ .Release.Name }}
diff --git a/heat/vFW_HPA/vFW/base_vfw.yaml b/heat/vFW_HPA/vFW/base_vfw.yaml
index 4b6d6488..55a4af6e 100644
--- a/heat/vFW_HPA/vFW/base_vfw.yaml
+++ b/heat/vFW_HPA/vFW/base_vfw.yaml
@@ -294,17 +294,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_private_ip_0 }
- __vfw_private_ip_1__ : { get_param: vfw_private_ip_1 }
- __vfw_private_ip_2__ : { get_param: vfw_private_ip_2 }
- __unprotected_private_net_cidr__ : { get_param: unprotected_private_net_cidr }
- __protected_private_net_cidr__ : { get_param: protected_private_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_private_ip_0 }
+ __vfw_private_ip_1__: { get_param: vfw_private_ip_1 }
+ __vfw_private_ip_2__: { get_param: vfw_private_ip_2 }
+ __unprotected_private_net_cidr__: { get_param: unprotected_private_net_cidr }
+ __protected_private_net_cidr__: { get_param: protected_private_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
@@ -373,13 +373,13 @@ resources:
__fw_ipaddr__: { get_param: vfw_private_ip_0 }
__protected_net_cidr__: { get_param: protected_private_net_cidr }
__sink_ipaddr__: { get_param: vsn_private_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_private_ip_0 }
- __vpg_private_ip_1__ : { get_param: vpg_private_ip_1 }
- __unprotected_private_net_cidr__ : { get_param: unprotected_private_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_private_ip_0 }
+ __vpg_private_ip_1__: { get_param: vpg_private_ip_1 }
+ __unprotected_private_net_cidr__: { get_param: unprotected_private_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
@@ -446,12 +446,12 @@ resources:
params:
__protected_net_gw__: { get_param: vfw_private_ip_1 }
__unprotected_net__: { get_param: unprotected_private_net_cidr }
- __install_script_version__ : { get_param: install_script_version }
- __vsn_private_ip_0__ : { get_param: vsn_private_ip_0 }
- __vsn_private_ip_1__ : { get_param: vsn_private_ip_1 }
- __protected_private_net_cidr__ : { get_param: protected_private_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_private_ip_0 }
+ __vsn_private_ip_1__: { get_param: vsn_private_ip_1 }
+ __protected_private_net_cidr__: { get_param: protected_private_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_HPA/vFWCL/vFWSNK/base_vfw.yaml b/heat/vFW_HPA/vFWCL/vFWSNK/base_vfw.yaml
index c46d8996..248d0861 100644
--- a/heat/vFW_HPA/vFWCL/vFWSNK/base_vfw.yaml
+++ b/heat/vFW_HPA/vFWCL/vFWSNK/base_vfw.yaml
@@ -108,7 +108,7 @@ parameters:
vsn_private_ip_1:
type: string
label: vSink private IP address towards the ONAP management network
- description: Private IP address that is assigned to the vSink to communicate with ONAP components
+ description: Private IP address that is assigned to the vSink to communicate with ONAP components
vfw_private_0_port_vnic_type:
type: string
description: vfw port 0 vnic type (normal, direct)
@@ -127,7 +127,7 @@ parameters:
default: normal
vsn_private_1_port_vnic_type:
type: string
- description: vsn port 1 vnic type (normal, direct)
+ description: vsn port 1 vnic type (normal, direct)
default: normal
vfw_name_0:
type: string
@@ -275,17 +275,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_private_ip_0 }
- __vfw_private_ip_1__ : { get_param: vfw_private_ip_1 }
- __vfw_private_ip_2__ : { get_param: vfw_private_ip_2 }
- __unprotected_private_net_cidr__ : { get_param: unprotected_private_net_cidr }
- __protected_private_net_cidr__ : { get_param: protected_private_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_private_ip_0 }
+ __vfw_private_ip_1__: { get_param: vfw_private_ip_1 }
+ __vfw_private_ip_2__: { get_param: vfw_private_ip_2 }
+ __unprotected_private_net_cidr__: { get_param: unprotected_private_net_cidr }
+ __protected_private_net_cidr__: { get_param: protected_private_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
@@ -353,12 +353,12 @@ resources:
params:
__protected_net_gw__: { get_param: vfw_private_ip_1 }
__unprotected_net__: { get_param: unprotected_private_net_cidr }
- __install_script_version__ : { get_param: install_script_version }
- __vsn_private_ip_0__ : { get_param: vsn_private_ip_0 }
- __vsn_private_ip_1__ : { get_param: vsn_private_ip_1 }
- __protected_private_net_cidr__ : { get_param: protected_private_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_private_ip_0 }
+ __vsn_private_ip_1__: { get_param: vsn_private_ip_1 }
+ __protected_private_net_cidr__: { get_param: protected_private_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_HPA/vFWCL/vPKG/base_vpkg.yaml b/heat/vFW_HPA/vFWCL/vPKG/base_vpkg.yaml
index 8ce1225b..6266a759 100644
--- a/heat/vFW_HPA/vFWCL/vPKG/base_vpkg.yaml
+++ b/heat/vFW_HPA/vFWCL/vPKG/base_vpkg.yaml
@@ -200,13 +200,13 @@ resources:
__fw_ipaddr__: { get_param: vfw_private_ip_0 }
__protected_net_cidr__: { get_param: protected_private_net_cidr }
__sink_ipaddr__: { get_param: vsn_private_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_private_ip_0 }
- __vpg_private_ip_1__ : { get_param: vpg_private_ip_1 }
- __unprotected_private_net_cidr__ : { get_param: unprotected_private_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_private_ip_0 }
+ __vpg_private_ip_1__: { get_param: vpg_private_ip_1 }
+ __unprotected_private_net_cidr__: { get_param: unprotected_private_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_HPA/vFW_SRIOV_NIC/base_vfw.yaml b/heat/vFW_HPA/vFW_SRIOV_NIC/base_vfw.yaml
index 2d26bd64..b753111e 100644
--- a/heat/vFW_HPA/vFW_SRIOV_NIC/base_vfw.yaml
+++ b/heat/vFW_HPA/vFW_SRIOV_NIC/base_vfw.yaml
@@ -297,17 +297,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_private_ip_0 }
- __vfw_private_ip_1__ : { get_param: vfw_private_ip_1 }
- __vfw_private_ip_2__ : { get_param: vfw_private_ip_2 }
- __unprotected_private_net_cidr__ : { get_param: unprotected_private_net_cidr }
- __protected_private_net_cidr__ : { get_param: protected_private_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_private_ip_0 }
+ __vfw_private_ip_1__: { get_param: vfw_private_ip_1 }
+ __vfw_private_ip_2__: { get_param: vfw_private_ip_2 }
+ __unprotected_private_net_cidr__: { get_param: unprotected_private_net_cidr }
+ __protected_private_net_cidr__: { get_param: protected_private_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
@@ -376,13 +376,13 @@ resources:
__fw_ipaddr__: { get_param: vfw_private_ip_0 }
__protected_net_cidr__: { get_param: protected_private_net_cidr }
__sink_ipaddr__: { get_param: vsn_private_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_private_ip_0 }
- __vpg_private_ip_1__ : { get_param: vpg_private_ip_1 }
- __unprotected_private_net_cidr__ : { get_param: unprotected_private_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_private_ip_0 }
+ __vpg_private_ip_1__: { get_param: vpg_private_ip_1 }
+ __unprotected_private_net_cidr__: { get_param: unprotected_private_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
@@ -449,12 +449,12 @@ resources:
params:
__protected_net_gw__: { get_param: vfw_private_ip_1 }
__unprotected_net__: { get_param: unprotected_private_net_cidr }
- __install_script_version__ : { get_param: install_script_version }
- __vsn_private_ip_0__ : { get_param: vsn_private_ip_0 }
- __vsn_private_ip_1__ : { get_param: vsn_private_ip_1 }
- __protected_private_net_cidr__ : { get_param: protected_private_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_private_ip_0 }
+ __vsn_private_ip_1__: { get_param: vsn_private_ip_1 }
+ __protected_private_net_cidr__: { get_param: protected_private_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/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
diff --git a/heat/vIPsec/vIPsec/base_vipsec.yaml b/heat/vIPsec/vIPsec/base_vipsec.yaml
index d64f30d3..f59bdc18 100644
--- a/heat/vIPsec/vIPsec/base_vipsec.yaml
+++ b/heat/vIPsec/vIPsec/base_vipsec.yaml
@@ -446,15 +446,15 @@ 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 }
- __vipsec_A_private_ip_0__ : { get_param: vipsec_A_private_ip_0 }
- __vipsec_A_private_ip_1__ : { get_param: vipsec_A_private_ip_1 }
- __protected_clientA_private_net_cidr__ : { get_param: protected_clientA_private_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 }
+ __vipsec_A_private_ip_0__: { get_param: vipsec_A_private_ip_0 }
+ __vipsec_A_private_ip_1__: { get_param: vipsec_A_private_ip_1 }
+ __protected_clientA_private_net_cidr__: { get_param: protected_clientA_private_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 }
__vpp_config__: { get_param: vpp_config }
__ipsec_config__: { get_param: ipsec_config }
@@ -543,7 +543,7 @@ resources:
NEWFILE
cat > __ipsec_config__<< NEWFILE
-
+
set interface state __input_interface__ up
set interface state __output_interface__ up
@@ -567,7 +567,7 @@ resources:
ipsec policy add spd 1 inbound priority 100 action protect sa 2 remote-ip-range 004.0.0.0-004.0.0.0
ipsec policy add spd 1 inbound priority 90 protocol 50 action bypass
ipsec policy add spd 1 outbound priority 90 protocol 50 action bypass
-
+
NEWFILE
vpp -c __vpp_config__
@@ -588,15 +588,15 @@ 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 }
- __vipsec_A_private_ip_0__ : { get_param: vipsec_B_private_ip_0 }
- __vipsec_A_private_ip_1__ : { get_param: vipsec_B_private_ip_1 }
- __protected_clientA_private_net_cidr__ : { get_param: protected_clientB_private_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 }
+ __vipsec_A_private_ip_0__: { get_param: vipsec_B_private_ip_0 }
+ __vipsec_A_private_ip_1__: { get_param: vipsec_B_private_ip_1 }
+ __protected_clientA_private_net_cidr__: { get_param: protected_clientB_private_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 }
__vpp_config__: { get_param: vpp_config }
__ipsec_config__: { get_param: ipsec_config }
@@ -685,7 +685,7 @@ resources:
NEWFILE
cat > __ipsec_config__<< NEWFILE
-
+
set interface state __input_interface__ up
set interface state __output_interface__ up
@@ -709,7 +709,7 @@ resources:
ipsec policy add spd 1 inbound priority 100 action protect sa 2 remote-ip-range 004.0.0.0-004.0.0.0
ipsec policy add spd 1 inbound priority 90 protocol 50 action bypass
ipsec policy add spd 1 outbound priority 90 protocol 50 action bypass
-
+
NEWFILE
vpp -c __vpp_config__
@@ -759,13 +759,13 @@ resources:
__ipsec_ipaddr__: { get_param: vipsec_A_private_ip_0 }
__protected_clientB_net_cidr__: { get_param: protected_clientB_private_net_cidr }
__sink_ipaddr__: { get_param: vsn_private_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_private_ip_0 }
- __vpg_private_ip_1__ : { get_param: vpg_private_ip_1 }
- __protected_clientA_net_cidr__ : { get_param: protected_clientA_private_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_private_ip_0 }
+ __vpg_private_ip_1__: { get_param: vpg_private_ip_1 }
+ __protected_clientA_net_cidr__: { get_param: protected_clientA_private_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
@@ -837,12 +837,12 @@ resources:
params:
__protected_net_gw__: { get_param: vipsec_B_private_ip_0 }
__protected_net_A__: { get_param: protected_clientA_private_net_cidr }
- __install_script_version__ : { get_param: install_script_version }
- __vsn_private_ip_0__ : { get_param: vsn_private_ip_0 }
- __vsn_private_ip_1__ : { get_param: vsn_private_ip_1 }
- __protected_clientB_private_net_cidr__ : { get_param: protected_clientB_private_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_private_ip_0 }
+ __vsn_private_ip_1__: { get_param: vsn_private_ip_1 }
+ __protected_clientB_private_net_cidr__: { get_param: protected_clientB_private_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/vLB/base_vlb.yaml b/heat/vLB/base_vlb.yaml
index 87e397c7..304d0602 100644
--- a/heat/vLB/base_vlb.yaml
+++ b/heat/vLB/base_vlb.yaml
@@ -1,7 +1,7 @@
##########################################################################
#
#==================LICENSE_START==========================================
-#
+#
#
# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
#
@@ -186,12 +186,12 @@ resources:
my_keypair:
type: OS::Nova::KeyPair
properties:
- name:
+ name:
str_replace:
template: base_rand
params:
base: { get_param: key_name }
- rand: { get_resource: random-str }
+ rand: { get_resource: random-str }
public_key: { get_param: pub_key }
save_private_key: false
diff --git a/heat/vLB/dnsscaling.yaml b/heat/vLB/dnsscaling.yaml
index 235bec84..32c711bc 100644
--- a/heat/vLB/dnsscaling.yaml
+++ b/heat/vLB/dnsscaling.yaml
@@ -1,7 +1,7 @@
##########################################################################
#
#==================LICENSE_START==========================================
-#
+#
#
# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
#
diff --git a/heat/vLB_CDS/base_template.yaml b/heat/vLB_CDS/base_template.yaml
index 1437206f..a171595f 100644
--- a/heat/vLB_CDS/base_template.yaml
+++ b/heat/vLB_CDS/base_template.yaml
@@ -169,4 +169,4 @@ outputs:
vlb_0_mac_address:
value: { get_param: vlb_0_int_pktgen_private_port_0_mac }
vpg_0_mac_address:
- value: { get_param: vpg_0_int_pktgen_private_port_0_mac } \ No newline at end of file
+ value: { get_param: vpg_0_int_pktgen_private_port_0_mac }
diff --git a/heat/vLB_CDS/vdns.yaml b/heat/vLB_CDS/vdns.yaml
index 7a7ab306..d24fbda4 100644
--- a/heat/vLB_CDS/vdns.yaml
+++ b/heat/vLB_CDS/vdns.yaml
@@ -218,4 +218,4 @@ resources:
unzip -j /opt/vlbms-scripts-__install_script_version__.zip -d /opt v_dns_install.sh
cd /opt
chmod +x v_dns_install.sh
- ./v_dns_install.sh \ No newline at end of file
+ ./v_dns_install.sh
diff --git a/heat/vLB_CDS/vlb.yaml b/heat/vLB_CDS/vlb.yaml
index e0330df4..c79d2ac6 100644
--- a/heat/vLB_CDS/vlb.yaml
+++ b/heat/vLB_CDS/vlb.yaml
@@ -290,4 +290,4 @@ resources:
unzip -j /opt/vlbms-scripts-__install_script_version__.zip -d /opt v_lb_install.sh
cd /opt
chmod +x v_lb_install.sh
- ./v_lb_install.sh \ No newline at end of file
+ ./v_lb_install.sh
diff --git a/heat/vLB_CDS/vpkg.yaml b/heat/vLB_CDS/vpkg.yaml
index e71e0bbd..24cdbc1a 100644
--- a/heat/vLB_CDS/vpkg.yaml
+++ b/heat/vLB_CDS/vpkg.yaml
@@ -223,4 +223,4 @@ resources:
unzip -j /opt/vlbms-scripts-__install_script_version__.zip -d /opt v_packetgen_install.sh
cd /opt
chmod +x v_packetgen_install.sh
- ./v_packetgen_install.sh \ No newline at end of file
+ ./v_packetgen_install.sh
diff --git a/heat/vLB_HPA/base_vlb.yaml b/heat/vLB_HPA/base_vlb.yaml
index e0276264..7364c9da 100644
--- a/heat/vLB_HPA/base_vlb.yaml
+++ b/heat/vLB_HPA/base_vlb.yaml
@@ -1,7 +1,7 @@
##########################################################################
#
#==================LICENSE_START==========================================
-#
+#
#
# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
#
@@ -194,12 +194,12 @@ resources:
my_keypair:
type: OS::Nova::KeyPair
properties:
- name:
+ name:
str_replace:
template: base_rand
params:
base: { get_param: key_name }
- rand: { get_resource: random-str }
+ rand: { get_resource: random-str }
public_key: { get_param: pub_key }
save_private_key: false
diff --git a/heat/vLB_HPA/dnsscaling.yaml b/heat/vLB_HPA/dnsscaling.yaml
index 235bec84..32c711bc 100644
--- a/heat/vLB_HPA/dnsscaling.yaml
+++ b/heat/vLB_HPA/dnsscaling.yaml
@@ -1,7 +1,7 @@
##########################################################################
#
#==================LICENSE_START==========================================
-#
+#
#
# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
#
diff --git a/heat/vLB_HPA/vLB_SRIOV_NIC/base_vlb.yaml b/heat/vLB_HPA/vLB_SRIOV_NIC/base_vlb.yaml
index 2b329075..0c4e5387 100644
--- a/heat/vLB_HPA/vLB_SRIOV_NIC/base_vlb.yaml
+++ b/heat/vLB_HPA/vLB_SRIOV_NIC/base_vlb.yaml
@@ -1,7 +1,7 @@
##########################################################################
#
#==================LICENSE_START==========================================
-#
+#
#
# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
#
@@ -230,12 +230,12 @@ resources:
my_keypair:
type: OS::Nova::KeyPair
properties:
- name:
+ name:
str_replace:
template: base_rand
params:
base: { get_param: key_name }
- rand: { get_resource: random-str }
+ rand: { get_resource: random-str }
public_key: { get_param: pub_key }
save_private_key: false
diff --git a/heat/vVG/base_vvg.yaml b/heat/vVG/base_vvg.yaml
index c20d4e48..a9644d8f 100644
--- a/heat/vVG/base_vvg.yaml
+++ b/heat/vVG/base_vvg.yaml
@@ -19,4 +19,4 @@ resources:
type: OS::Cinder::VolumeAttachment
properties:
volume_id: { get_resource: cinder_volume }
- instance_uuid: { get_param: nova_instance } \ No newline at end of file
+ instance_uuid: { get_param: nova_instance }