summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Blaisonneau <david.blaisonneau@orange.com>2016-01-29 11:10:38 +0100
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-01-29 13:07:51 +0000
commit4a1eb3410d6480a41e24bcfc24332f0215ed9a67 (patch)
tree9ca5d1b04eeab902f876d1396635f0c9bf9dd586
parent55c9b07355f973820438651bd6b215ad47152fe7 (diff)
joid: remove ceph_disk_controllers param and correct ext-net name replace
Change-Id: I86a4b8164b3d371ff7b4e8e340f7ae924c52f70c Signed-off-by: David Blaisonneau <david.blaisonneau@orange.com>
-rw-r--r--jjb/joid/joid-deploy.sh11
-rw-r--r--jjb/opnfv/installer-params.yml4
-rw-r--r--jjb/opnfv/slave-params.yml4
3 files changed, 2 insertions, 17 deletions
diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh
index b2b0ebb4b..59ba01588 100644
--- 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 9dd3d5406..e03b4749e 100644
--- a/jjb/opnfv/installer-params.yml
+++ b/jjb/opnfv/installer-params.yml
@@ -74,10 +74,6 @@
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"
description: "Local lab config and Openstack openrc location"
diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index 414853784..daa4a4f1e 100644
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -391,10 +391,6 @@
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
description: "External network to create (name;type;first ip;last ip; gateway;network)"