xextended the external port to the 5 mac address in case gateway

[joid.git] / ci / 01-deploybundle.sh

diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh
index e46d0c1..7aceab3 100755 (executable)
--- a/ci/01-deploybundle.sh
+++ b/ci/01-deploybundle.sh
@@ -31,17 +31,24 @@ esac
 
 #read the value from deployment.yaml
 if [ -e ~/.juju/deployment.yaml ]; then
-   extport=`grep "ext-port" deployment.yaml | cut -d ' ' -f 4 | sed -e 's/ //'`
-   sed --i "s@#ext-port: \"eth1\"@ext-port: \"$extport\"@g" ./bundles.yaml
 
-   datanet=`grep "dataNetwork" deployment.yaml | cut -d ' ' -f 4 | sed -e 's/ //'`
-   sed --i "s@#os-data-network: 10.4.8.0/21@os-data-network: $datanet@g" ./bundles.yaml
+   cp ~/.juju/deployment.yaml ./deployment.yaml
 
-   admnet=`grep "admNetwork" deployment.yaml | cut -d ' ' -f 4 | sed -e 's/ //'`
-   sed --i "s@10.4.1.1@$admnet@g" ./bundles.yaml
+   if [ -e ~/.juju/deployment.yaml ]; then
+      cp ~/.juju/deployconfig.yaml ./deployconfig.yaml
 
-   cephdisk=`grep "disk" deployment.yaml | cut -d ':' -f 2 | sed -e 's/ //'`
-   sed --i "s@osd-devices: /srv@osd-devices: $cephdisk@g" ./bundles.yaml
+      extport=`grep "ext-port" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //' | tr ',' ' '`
+      sed --i "s@#ext-port: \"eth1\"@ext-port: \"$extport\"@g" ./bundles.yaml
+
+      datanet=`grep "dataNetwork" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //'`
+      sed --i "s@#os-data-network: 10.4.8.0/21@os-data-network: $datanet@g" ./bundles.yaml
+
+      admnet=`grep "admNetwork" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //'`
+      sed --i "s@10.4.1.1@$admnet@g" ./bundles.yaml
+
+      cephdisk=`grep "disk" deployconfig.yaml | cut -d ':' -f 2 | sed -e 's/ //'`
+      sed --i "s@osd-devices: /srv@osd-devices: $cephdisk@g" ./bundles.yaml
+   fi
 fi
 
 case "$3" in