Update ip pool name to be more generic

So both vFW and vDNS use cases can re-use the same ip pool

Change-Id: I9a72bc3947ecaf0868011891dd2df8a2b34261d9
Issue-ID: SDNC-761
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>

diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/provisioning/provision.sh b/kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/provisioning/provision.sh
index 78f79ce..5db036f 100755 (executable)
--- a/kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/provisioning/provision.sh
+++ b/kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/provisioning/provision.sh
@@ -70,11 +70,11 @@ curl --silent -X POST \
   -H 'Authorization: Token onceuponatimeiplayedwithnetbox20180814' \
   -H 'Content-Type: application/json' \
   -d '{
-  "prefix": "{{ .Values.service.vfw_protected_pool }}",
+  "prefix": "{{ .Values.service.private2 }}",
   "site": 1,
   "tenant": 1,
   "is_pool": false,
-  "description": "IP Pool for protected network - vFW use case"
+  "description": "IP Pool for private network 2"
 }'
 
 echo "Create Prefix for vFW unprotected network"
@@ -83,11 +83,11 @@ curl --silent -X POST \
   -H 'Authorization: Token onceuponatimeiplayedwithnetbox20180814' \
   -H 'Content-Type: application/json' \
   -d '{
-  "prefix": "{{ .Values.service.vfw_unprotected_pool }}",
+  "prefix": "{{ .Values.service.private1 }}",
   "site": 1,
   "tenant": 1,
   "is_pool": false,
-  "description": "IP Pool for unprotected network - vFW use case"
+  "description": "IP Pool for private network 1"
 }'
 
 echo "Create Prefix for ONAP general purpose network"
@@ -96,7 +96,7 @@ curl --silent -X POST \
   -H 'Authorization: Token onceuponatimeiplayedwithnetbox20180814' \
   -H 'Content-Type: application/json' \
   -d '{
-  "prefix": "{{ .Values.service.vfw_mgmt_pool }}",
+  "prefix": "{{ .Values.service.management }}",
   "site": 1,
   "tenant": 1,
   "is_pool": false,

diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/values.yaml b/kubernetes/contrib/charts/netbox/charts/netbox-app/values.yaml
index 96328ca..ddfdc4b 100755 (executable)
--- a/kubernetes/contrib/charts/netbox/charts/netbox-app/values.yaml
+++ b/kubernetes/contrib/charts/netbox/charts/netbox-app/values.yaml
@@ -66,9 +66,9 @@ service:
 
   # The following subnet pool will be
   # configured in Netbox by provisioning script.
-  vfw_protected_pool: 192.168.20.0/24
-  vfw_unprotected_pool: 192.168.10.0/24
-  vfw_mgmt_pool: 10.0.101.0/24
+  private1: 192.168.10.0/24
+  private2: 192.168.20.0/24
+  management: 10.0.101.0/24
 
 ingress:
   enabled: false