Make onos service name configurable
Change-Id: I799ed24d461909a90fc334acfb51184d3932a42a
diff --git a/mininet/Chart.yaml b/mininet/Chart.yaml
index c35d2e3..ba62bad 100644
--- a/mininet/Chart.yaml
+++ b/mininet/Chart.yaml
@@ -17,4 +17,4 @@
appVersion: "1.0"
description: A Helm chart for Mininet
name: mininet
-version: 0.1.0
+version: 0.2.0
diff --git a/mininet/templates/configmap.yaml b/mininet/templates/configmap.yaml
index 2f0833e..7a2c1b6 100644
--- a/mininet/templates/configmap.yaml
+++ b/mininet/templates/configmap.yaml
@@ -18,4 +18,4 @@
metadata:
name: {{ .Release.Name }}-configmap
data:
-{{ (.Files.Glob "toposcripts/*").AsConfig | indent 2 }}
\ No newline at end of file
+{{ (tpl (.Files.Glob "toposcripts/*").AsConfig .) | indent 2 }}
diff --git a/mininet/toposcripts/topo.py b/mininet/toposcripts/topo.py
index 7dd6070..8a89515 100644
--- a/mininet/toposcripts/topo.py
+++ b/mininet/toposcripts/topo.py
@@ -36,7 +36,7 @@
info( '*** Creating network\n' )
OVSSwitch13 = partial( OVSSwitch, protocols='OpenFlow13' )
- controllerIp = socket.gethostbyname( 'onos-openflow.default.svc.cluster.local' )
+ controllerIp = socket.gethostbyname( '{{ .Values.onosOpenflowSvc }}' )
net = Mininet( topo=SingleSwitchTopo(1),
controller=lambda name: RemoteController( name, ip=controllerIp, port=6653 ),
switch=OVSSwitch13
diff --git a/mininet/values.yaml b/mininet/values.yaml
index 68d914d..32a6fea 100644
--- a/mininet/values.yaml
+++ b/mininet/values.yaml
@@ -46,4 +46,6 @@
topologyKey: kubernetes.io/hostname
annotations:
- cni: "calico,pon1"
\ No newline at end of file
+ cni: "calico,pon1"
+
+onosOpenflowSvc: "onos-openflow.default.svc.cluster.local"