Merge "Enable self-cleanup after testing vcFW deployment"

[multicloud/k8s.git] / kud / demo / firewall / values.yaml

diff --git a/kud/demo/firewall/values.yaml b/kud/demo/firewall/values.yaml
index 7935828..abc39f0 100644 (file)
--- a/kud/demo/firewall/values.yaml
+++ b/kud/demo/firewall/values.yaml
@@ -7,7 +7,7 @@ replicaCount: 1
 image:
   repository: virtlet.cloud/ubuntu/16.04
   tag: latest
-  pullPolicy: Always
+  pullPolicy: IfNotPresent
 
 nameOverride: ""
 fullnameOverride: ""
@@ -17,25 +17,35 @@ resources:
 
 #global vars for parent and subcharts.
 global:
-  demoArtifactsVersion: 1.5.0
+
+  #Networks
+  unprotectedNetworkName: unprotected-private-net
+  protectedPrivateNetCidr: 192.168.10.0/24
+  protectedPrivateNetGw: 192.168.10.1/24
+
+  onapPrivateNetworkName: onap-private-net
+  onapPrivateNetCidr: 10.10.0.0/16
+  onapPrivateNetGw: 10.10.0.1/16
+
+  protectedNetworkName: protected-private-net
+  protectedNetCidr: 192.168.20.0/24
+  protectedNetGwIp: 192.168.20.100
+  protectedNetGw: 192.168.20.100/24
+
+  #vFirewall container
   vfwPrivateIp0: 192.168.10.3
   vfwPrivateIp1: 192.168.20.2
   vfwPrivateIp2: 10.10.100.3
+  #Packetgen container
   vpgPrivateIp0: 192.168.10.2
   vpgPrivateIp1: 10.0.100.2
+  #Sink container
   vsnPrivateIp0: 192.168.20.3
   vsnPrivateIp1: 10.10.100.4
+
+  #########
+  ovnMultusNetworkName: ovn-networkobj
+  demoArtifactsVersion: 1.5.0
   dcaeCollectorIp: 10.0.4.1
   dcaeCollectorPort: 8081
-  protectedNetGw: 192.168.20.100
-  protectedNetCidr: 192.168.20.0/24
-  protectedPrivateNetCidr: 192.168.10.0/24
-  onapPrivateNetCidr: 10.10.0.0/16
-  protectedNetGw: 192.168.20.100
-  protectedNetworkName: protected-private-net
-  unprotectedNetworkName: unprotected-private-net
-  ovnMultusNetworkName: ovn-networkobj
-  onapPrivateNetworkName: onap-private-net
-  protectedPrivateGateway: 10.10.0.1/16
-  gatewayVariable: 24