summaryrefslogtreecommitdiffstats
path: root/kubernetes/contrib/charts
diff options
context:
space:
mode:
authorMartin Ouimet <martin.ouimet@bell.ca>2018-09-11 16:12:23 -0400
committerMartin Ouimet <martin.ouimet@bell.ca>2018-09-11 16:12:23 -0400
commit5ac8f28cbb10e01051b939239293e748d2ad0622 (patch)
tree8867d050fc10cd7765150811ec2735a4089e522f /kubernetes/contrib/charts
parenta7a1cfcb91f35df6c835aab8bfbfb766c41d1ee2 (diff)
Network prefix configurable in Helm
The network prefix cidr that are automatically provisioned into Netbox at the creation time were hard coded in the provision script. The purpose of this patch is to externalize the network prefix, so they can be configured in the Values file of the Helm chart. Change-Id: Ie5019f56339146e61794ea7308300436d790b4c4 Issue-ID: CCSDK-533 Signed-off-by: Martin Ouimet <martin.ouimet@bell.ca>
Diffstat (limited to 'kubernetes/contrib/charts')
-rwxr-xr-xkubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/provisioning/provision.sh32
1 files changed, 6 insertions, 26 deletions
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 f0439a50b3..adf10a1d0d 100755
--- 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,10 +70,10 @@ curl --silent -X POST \
-H 'Authorization: Token onceuponatimeiplayedwithnetbox20180814' \
-H 'Content-Type: application/json' \
-d '{
- "prefix": "192.168.20.0/24",
+ "prefix": "{{ .Values.service.vfw_protected_pool }}",
"site": 1,
"tenant": 1,
- "is_pool": true,
+ "is_pool": false,
"description": "IP Pool for protected network - vFW use case"
}'
@@ -83,10 +83,10 @@ curl --silent -X POST \
-H 'Authorization: Token onceuponatimeiplayedwithnetbox20180814' \
-H 'Content-Type: application/json' \
-d '{
- "prefix": "192.168.10.0/24",
+ "prefix": "{{ .Values.service.vfw_unprotected_pool }}",
"site": 1,
"tenant": 1,
- "is_pool": true,
+ "is_pool": false,
"description": "IP Pool for unprotected network - vFW use case"
}'
@@ -96,30 +96,10 @@ curl --silent -X POST \
-H 'Authorization: Token onceuponatimeiplayedwithnetbox20180814' \
-H 'Content-Type: application/json' \
-d '{
- "prefix": "10.0.0.0/8",
+ "prefix": "{{ .Values.service.vfw_mgmt_pool }}",
"site": 1,
"tenant": 1,
- "is_pool": true,
+ "is_pool": false,
"description": "IP Pool for ONAP - general purpose"
}'
-
-# Assign the first IP of the subnets in Netbox to avoid getting IP 0 from auto assignment.
-
-echo "Assign IP 0 from prefix for vFW protected network"
-curl --silent -X POST \
- http://{{ .Values.service.name }}:{{ .Values.service.internalPort }}/api/ipam/prefixes/1/available-ips/ \
- -H 'Authorization: Token onceuponatimeiplayedwithnetbox20180814' \
- -H 'Content-Type: application/json'
-
-echo "Assign IP 0 from prefix for vFW unprotected network"
-curl --silent -X POST \
- http://{{ .Values.service.name }}:{{ .Values.service.internalPort }}/api/ipam/prefixes/2/available-ips/ \
- -H 'Authorization: Token onceuponatimeiplayedwithnetbox20180814' \
- -H 'Content-Type: application/json'
-
-echo "Assign IP 0 from prefix for ONAP general purpose network"
-curl --silent -X POST \
- http://{{ .Values.service.name }}:{{ .Values.service.internalPort }}/api/ipam/prefixes/3/available-ips/ \
- -H 'Authorization: Token onceuponatimeiplayedwithnetbox20180814' \
- -H 'Content-Type: application/json'