ciao-controller,ciao-launcher: Add support for ceph_id parameter

Signed-off-by: Obed N Munoz <obed.n.munoz@intel.com>
This commit is contained in:
Obed N Munoz
2016-11-24 15:12:51 -06:00
parent 2314402a7f
commit 5180d30f6b
4 changed files with 16 additions and 5 deletions
+1
View File
@@ -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
----------------
+11 -3
View File
@@ -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
+1 -1
View File
@@ -66,7 +66,7 @@ docker logs -f ciao-scheduler
Environment Variables
---------------------
- ``CEPH_ID`` Specifies the CEPH storage ID (default=admin)
Extra Build ARGs
----------------
+3 -1
View File
@@ -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