manifests: allow primary nic to be customized

Don't hardcode eth1 in the manifests, allow it to be substituted into the manifests. Signed-off-by: Daniel P. Berrange <[email protected]>
cgvarela · Jul 13, 2017 · 72e8411 · 72e8411
1 parent 983679b
commit 72e8411
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/hack/build-manifests.sh b/hack/build-manifests.sh
@@ -33,6 +33,7 @@ rm -f "manifests/*.yaml"
 # Render kubernetes manifests
 for arg in $args; do
     sed -e "s/{{ master_ip }}/$master_ip/g" \
+        -e "s/{{ primary_nic }}/$primary_nic/g" \
         -e "s/{{ docker_tag }}/$docker_tag/g" \
         -e "s/{{ docker_prefix }}/$docker_prefix/g" \
         $arg > ${arg%%.in}

diff --git a/hack/config-default.sh b/hack/config-default.sh
@@ -6,3 +6,4 @@ manifest_templates="`ls manifests/*.in`"
 master_ip=192.168.200.2
 master_port=8184
 network_provider=weave
+primary_nic=${primary_nic:-eth1}
diff --git a/hack/config.sh b/hack/config.sh
@@ -1,5 +1,5 @@
 unset binaries docker_images docker_prefix docker_tag manifest_templates \
-      master_ip master_port network_provider
+      master_ip master_port network_provider primary_nic
 
 source hack/config-default.sh
 
@@ -8,4 +8,4 @@ source hack/config-default.sh
 test -f "hack/config-local.sh" && source hack/config-local.sh
 
 export binaries docker_images docker_prefix docker_tag manifest_templates \
-       master_ip master_port network_provider
+       master_ip master_port network_provider primary_nic
diff --git a/manifests/libvirt.yaml.in b/manifests/libvirt.yaml.in
@@ -26,7 +26,7 @@ spec:
           runAsUser: 0
         env:
         - name: LIBVIRTD_DEFAULT_NETWORK_DEVICE
-          value: eth1
+          value: {{ primary_nic }}
         volumeMounts:
           - mountPath: /host-dev
             name: host-dev

diff --git a/manifests/virt-manifest.yaml.in b/manifests/virt-manifest.yaml.in
@@ -50,7 +50,7 @@ spec:
           runAsUser: 0
         env:
         - name: LIBVIRTD_DEFAULT_NETWORK_DEVICE
-          value: eth1
+          value: {{ primary_nic }}
         volumeMounts:
           - name: libvirt-runtime
             mountPath: /var/run/libvirt