joid: remove ceph_disk_controllers param and correct ext-net name replace

[releng.git] / jjb / joid / joid-deploy.sh

diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh
index b2b0ebb..59ba015 100644 (file)
--- a/jjb/joid/joid-deploy.sh
+++ b/jjb/joid/joid-deploy.sh
@@ -131,19 +131,12 @@ sed -i -- "s/admin-password: openstack/admin-password: $OS_ADMIN_PASSWORD/" $SRC
 
 if [ -n "$EXTNET_NAME" ]; then
     echo "------ Set openstack default network ------"
-    sed -i -- "s/\"neutron-external-network\": ext_net/\"neutron-external-network\": $EXTNET_NAME/" $SRCBUNDLE
+    sed -i -- "s/neutron-external-network: ext_net/neutron-external-network: $EXTNET_NAME/" $SRCBUNDLE
 fi
 
 echo "------ Set ceph disks ------"
-CEPH_DISKS_CONTROLLERS=${CEPH_DISKS_CONTROLLERS:-}
-if [ -z "$CEPH_DISKS_CONTROLLERS" ]; then
-    CEPH_DISKS_CONTROLLERS=$CEPH_DISKS
-fi
-
 #Find the first line of osd-devices to change the one for ceph, then the other for ceph-osd
-CEPH_DEV_LINE=$(grep -nr osd-devices $SRCBUNDLE |head -n1|cut -d: -f1)
-sed -i -- "${CEPH_DEV_LINE}s@osd-devices: /srv@osd-devices: $CEPH_DISKS@" $SRCBUNDLE
-sed -i -- "s@osd-devices: /srv@osd-devices: $CEPH_DISKS_CONTROLLERS@" $SRCBUNDLE
+sed -i -- "s@osd-devices: /srv@osd-devices: $CEPH_DISKS@" $SRCBUNDLE
 sed -i -r -- "s/^(\s+osd-reformat: )'no'/\1'$CEPH_REFORMAT'/" $SRCBUNDLE
 
 ##