summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-01-11 09:57:27 +0100
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-01-11 09:59:45 +0100
commit3f71c9b5f20ca5c1bcad65c738a45d663495baf3 (patch)
tree3e0253a0247482a953e8bc5a16846836880da93f
parent321d67f827ea17d299f7e3eb69f3c6c6c76d6a7d (diff)
joid: Set CEPH_DISKS_CONTROLLERS if unset
Change-Id: I10d3d5853fda963adab1d3359b3415501b09a364 Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
-rw-r--r--jjb/joid/joid-ci-jobs.yml2
-rw-r--r--jjb/joid/joid-deploy.sh2
2 files changed, 3 insertions, 1 deletions
diff --git a/jjb/joid/joid-ci-jobs.yml b/jjb/joid/joid-ci-jobs.yml
index 4a8b60db5..0eaa41590 100644
--- a/jjb/joid/joid-ci-jobs.yml
+++ b/jjb/joid/joid-ci-jobs.yml
@@ -156,7 +156,7 @@
cd $WORKSPACE/ci
./clean.sh
- shell:
- !include-raw ./joid-deploy.sh
+ !include-raw-escape: ./joid-deploy.sh
########################
# trigger macros
diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh
index 53255a3ff..1348ca0be 100644
--- a/jjb/joid/joid-deploy.sh
+++ b/jjb/joid/joid-deploy.sh
@@ -73,9 +73,11 @@ echo "------ Set openstack password ------"
sed -i -- "s/\"admin-password\": openstack/\"admin-password\": $OS_ADMIN_PASSWORD/" $SRCBUNDLE
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