From 5180d30f6bff36ddf11ca82574970f0e46618e03 Mon Sep 17 00:00:00 2001 From: Obed N Munoz Date: Thu, 24 Nov 2016 15:12:51 -0600 Subject: [PATCH] ciao-controller,ciao-launcher: Add support for ceph_id parameter Signed-off-by: Obed N Munoz --- ciao-controller/README.md | 1 + ciao-controller/controller.sh | 14 +++++++++++--- ciao-launcher/README.md | 2 +- ciao-launcher/launcher.sh | 4 +++- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ciao-controller/README.md b/ciao-controller/README.md index 13a0125..bac2bf6 100644 --- a/ciao-controller/README.md +++ b/ciao-controller/README.md @@ -74,6 +74,7 @@ Environment Variables --------------------- - ``IDENTITY_HOST`` Specifies the Keystone URL. Example: example.com - ``CONTROLLER_HOST`` Specifies the CIAO Controller URL. Example: example.com +- ``CEPH_ID`` Specifies the CEPH storage ID (default=admin) Extra Build ARGs ---------------- diff --git a/ciao-controller/controller.sh b/ciao-controller/controller.sh index 344a090..e278e63 100755 --- a/ciao-controller/controller.sh +++ b/ciao-controller/controller.sh @@ -2,6 +2,7 @@ IDENTITY_HOST="${IDENTITY_HOST:-localhost}" CONTROLLER_HOST="${CONTROLLER_HOST:-localhost}" +CEPH_ID="${CEPH_ID:-admin}" sed -i.bak s/CONTROLLER_HOST/$CONTROLLER_HOST/g /root/ciaorc sed -i.bak s/IDENTITY_HOST/$IDENTITY_HOST/g /root/ciaorc @@ -22,8 +23,15 @@ if [ ! -d "/etc/ssl" ] ; then ln -s /etc/ca-certs/ /etc/ssl/certs ln -s /etc/ca-certs/cacert.pem /usr/share/ca-certs/$hash cat /etc/pki/ciao/controller_cert.pem >> /etc/ca-certs/cacert.pem - cat /etc/pki/ciao/ciao-image_cert.pem >> /etc/ca-certs/cacert.pem fi -# Starting the controller -$GOBIN/ciao-controller -logtostderr -ceph_id=admin -v=3 +# Wait until keystone is ready +source /root/ciaorc +echo "Waiting keystone to start " +until ciao-cli tenant list ; do + printf '.' + sleep 1 +done +# Starging ciao-controller +$GOBIN/ciao-controller -logtostderr -ceph_id=$CEPH_ID -v=3 + diff --git a/ciao-launcher/README.md b/ciao-launcher/README.md index 6035aed..9bd7e13 100644 --- a/ciao-launcher/README.md +++ b/ciao-launcher/README.md @@ -66,7 +66,7 @@ docker logs -f ciao-scheduler Environment Variables --------------------- - +- ``CEPH_ID`` Specifies the CEPH storage ID (default=admin) Extra Build ARGs ---------------- diff --git a/ciao-launcher/launcher.sh b/ciao-launcher/launcher.sh index bef10c3..3b0c265 100755 --- a/ciao-launcher/launcher.sh +++ b/ciao-launcher/launcher.sh @@ -1,6 +1,8 @@ #!/bin/bash set -x +CEPH_ID="${CEPH_ID:-admin}" + # Copy images mkdir -p /var/lib/ciao/images if [ ! "$(ls -A /var/lib/ciao/images)" ]; then @@ -18,4 +20,4 @@ mkdir -p /var/run killall -9 dnsmasq dnsmasq -C /etc/dnsmasq.conf -$GOBIN/ciao-launcher -logtostderr -v=3 +$GOBIN/ciao-launcher -logtostderr -ceph_id=$CEPH_ID -v=3