Skip to content

Commit

Permalink
new upstream release LTS CloudStack v4.11.2
Browse files Browse the repository at this point in the history
  • Loading branch information
resmo authored and mattclay committed Dec 10, 2018
1 parent 013a249 commit 33de8a7
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM ubuntu:xenial-20180808
FROM ubuntu:xenial-20181113

MAINTAINER "René Moser" <mail@renemoser.net>

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;
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 33de8a7

Please sign in to comment.