Cleanup vFW/vPacketGen templates for closed loop

[demo.git] / heat / vFWCL / vPKG / base_vpkg.env

diff --git a/heat/vFWCL/vPNG/base_vpng.env b/heat/vFWCL/vPKG/base_vpkg.env
similarity index 74%
rename from heat/vFWCL/vPNG/base_vpng.env
rename to heat/vFWCL/vPKG/base_vpkg.env
index 1749fc5..a7a30e3 100644 (file)
--- a/heat/vFWCL/vPNG/base_vpng.env
+++ b/heat/vFWCL/vPKG/base_vpkg.env
@@ -1,27 +1,25 @@
-parameters:\r
-  vfw_image_name: PUT THE VM IMAGE NAME HERE\r
-  vfw_flavor_name: PUT THE VM FLAVOR NAME HERE\r
-  public_net_id: PUT THE PUBLIC NETWORK ID HERE\r
-  unprotected_private_network_id: zdfw1fwl01_unprotected\r
-  unprotected_private_subnet_id: zdfw1fwl01_unprotected\r
-  onap_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE\r
-  onap_private_subnet_id: PUT THE ONAP PRIVATE NETWORK NAME HERE\r
-  unprotected_private_net_cidr: 192.168.10.0/24\r
-  protected_private_net_cidr: 192.168.20.0/24\r
-  onap_private_net_cidr: 10.0.0.0/16\r
-  vfw_private_ip_0: 192.168.10.100\r
-  vpg_private_ip_0: 192.168.10.200\r
-  vpg_private_ip_1: 10.0.100.2\r
-  vsn_private_ip_0: 192.168.20.250\r
-  vpg_name_0: zdfw1fwl01pgn01\r
-  vnf_id: vPNG_Firewall_demo_app\r
-  vf_module_id: vTrafficPNG\r
-  dcae_collector_ip: 10.0.4.102\r
-  dcae_collector_port: 8080\r
-  repo_url_blob: https://nexus.onap.org/content/sites/raw\r
-  repo_url_artifacts: https://nexus.onap.org/content/groups/staging\r
+parameters:
+  image_name: PUT THE VM IMAGE NAME HERE
+  flavor_name: PUT THE VM FLAVOR NAME HERE
+  public_net_id: PUT THE PUBLIC NETWORK ID HERE
+  unprotected_private_net_id: zdfw1fwl01_unprotected
+  unprotected_private_subnet_id: zdfw1fwl01_unprotected_sub
+  unprotected_private_net_cidr: 192.168.10.0/24
+  onap_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE
+  onap_private_subnet_id: PUT THE ONAP PRIVATE NETWORK NAME HERE
+  onap_private_net_cidr: 10.0.0.0/16
+  protected_private_net_cidr: 192.168.20.0/24
+  vfw_private_ip_0: 192.168.10.100
+  vpg_private_ip_0: 192.168.10.200
+  vpg_private_ip_1: 10.0.100.2
+  vsn_private_ip_0: 192.168.20.250
+  vpg_name_0: zdfw1fwl01pgn01
+  vnf_id: vPNG_Firewall_demo_app
+  vf_module_id: vTrafficPNG
+  repo_url_blob: https://nexus.onap.org/content/sites/raw
+  repo_url_artifacts: https://nexus.onap.org/content/groups/staging
   demo_artifacts_version: 1.1.0
-  install_script_version: 1.1.0-SNAPSHOT\r
-  key_name: vfw_key\r
+  install_script_version: 1.1.0-SNAPSHOT
+  key_name: vfw_key
   pub_key: PUT YOUR PUBLIC KEY HERE
-  cloud_env: PUT openstack OR rackspace HERE\r
+  cloud_env: PUT openstack OR rackspace HERE