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

Change-Id: I86a4b8164b3d371ff7b4e8e340f7ae924c52f70c
Signed-off-by: David Blaisonneau <david.blaisonneau@orange.com>

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
 
 ##

diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml
index 9dd3d54..e03b474 100644 (file)
--- a/jjb/opnfv/installer-params.yml
+++ b/jjb/opnfv/installer-params.yml
@@ -73,10 +73,6 @@
             name: CEPH_DISKS
             default: '/srv'
             description: "Disks to use by ceph by default (space separated list)"
-        - string:
-            name: CEPH_DISKS_CONTROLLERS
-            default: ''
-            description: "Disks to use by ceph by controllers (empty if same as CEPH_DISKS)"
         - string:
             name: LAB_CONFIG
             default: "$HOME/joid_config"

diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index 4148537..daa4a4f 100644 (file)
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -390,10 +390,6 @@
             name: CEPH_DISKS
             default: /dev/sdb /dev/sdc
             description: "Disks to use by ceph by default (space separated list)"
-        - string:
-            name: CEPH_DISKS_CONTROLLERS
-            default: /dev/sdb
-            description: "Disks to use by ceph on controler nodes (space separated list)"
         - string:
             name: EXTERNAL_NETWORK
             default: ext-net;flat;161.105.231.2;161.105.231.62;161.105.231.1;161.105.231.0/26