diff --git a/Dockerfile b/Dockerfile index 84e37e0..9b8a989 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -FROM ubuntu:xenial-20180808 +FROM ubuntu:xenial-20181113 MAINTAINER "René Moser" -ARG src_url=https://github.com/apache/cloudstack/archive/4.11.1.0.tar.gz +ARG src_url=https://github.com/apache/cloudstack/archive/4.11.2.0.tar.gz RUN echo 'mysql-server mysql-server/root_password password root' | debconf-set-selections; \ echo 'mysql-server mysql-server/root_password_again password root' | debconf-set-selections; @@ -59,7 +59,7 @@ RUN (/usr/bin/mysqld_safe &); \ COPY zones.cfg /opt/zones.cfg COPY nginx_default.conf /etc/nginx/sites-available/default -RUN pip install cs==2.3.1 +RUN pip install cs==2.5 COPY run.sh /opt/run.sh COPY deploy.sh /opt/deploy.sh COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf diff --git a/deploy.sh b/deploy.sh index 09314fb..d4872de 100755 --- a/deploy.sh +++ b/deploy.sh @@ -12,12 +12,12 @@ sleep 3 python /opt/cloudstack/tools/marvin/marvin/deployDataCenter.py -i /opt/zones.cfg export CLOUDSTACK_ENDPOINT=http://127.0.0.1:8096 -export CLOUDSTACK_KEY="" -export CLOUDSTACK_SECRET="" +export CLOUDSTACK_KEY=dummy +export CLOUDSTACK_SECRET=dummy # Add Simulator to supported hypervisors exclusively cs updateConfiguration name=hypervisor.list value=Simulator # Workaround for Nuage VPC Offering -vpc_offering_id="$(cs listVPCOfferings listall=true name=Nuage | jq .vpcoffering[0].id)" +vpc_offering_id="$(cs listVPCOfferings name=Nuage | jq '.vpcoffering[0].id')" cs updateVPCOffering id=$vpc_offering_id state=Disabled diff --git a/run.sh b/run.sh index d9b1b87..64bcd2d 100755 --- a/run.sh +++ b/run.sh @@ -11,8 +11,8 @@ done sleep 3 export CLOUDSTACK_ENDPOINT=http://127.0.0.1:8096 -export CLOUDSTACK_KEY="" -export CLOUDSTACK_SECRET="" +export CLOUDSTACK_KEY=dummy +export CLOUDSTACK_SECRET=dummy -admin_id="$(cs listUsers account=admin | jq .user[0].id)" -cs getUserKeys id=$admin_id | jq .userkeys > /var/www/html/admin.json +admin_id="$(cs listUsers account=admin | jq '.user[0].id')" +cs getUserKeys id=$admin_id | jq '.userkeys' > /var/www/html/admin.json