Skip to content

Commit 33de8a7

Browse files
resmomattclay
authored andcommitted
new upstream release LTS CloudStack v4.11.2
1 parent 013a249 commit 33de8a7

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
FROM ubuntu:xenial-20180808
1+
FROM ubuntu:xenial-20181113
22

33
MAINTAINER "René Moser" <[email protected]>
44

5-
ARG src_url=https://github.com/apache/cloudstack/archive/4.11.1.0.tar.gz
5+
ARG src_url=https://github.com/apache/cloudstack/archive/4.11.2.0.tar.gz
66

77
RUN echo 'mysql-server mysql-server/root_password password root' | debconf-set-selections; \
88
echo 'mysql-server mysql-server/root_password_again password root' | debconf-set-selections;
@@ -59,7 +59,7 @@ RUN (/usr/bin/mysqld_safe &); \
5959

6060
COPY zones.cfg /opt/zones.cfg
6161
COPY nginx_default.conf /etc/nginx/sites-available/default
62-
RUN pip install cs==2.3.1
62+
RUN pip install cs==2.5
6363
COPY run.sh /opt/run.sh
6464
COPY deploy.sh /opt/deploy.sh
6565
COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf

deploy.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ sleep 3
1212
python /opt/cloudstack/tools/marvin/marvin/deployDataCenter.py -i /opt/zones.cfg
1313

1414
export CLOUDSTACK_ENDPOINT=http://127.0.0.1:8096
15-
export CLOUDSTACK_KEY=""
16-
export CLOUDSTACK_SECRET=""
15+
export CLOUDSTACK_KEY=dummy
16+
export CLOUDSTACK_SECRET=dummy
1717

1818
# Add Simulator to supported hypervisors exclusively
1919
cs updateConfiguration name=hypervisor.list value=Simulator
2020

2121
# Workaround for Nuage VPC Offering
22-
vpc_offering_id="$(cs listVPCOfferings listall=true name=Nuage | jq .vpcoffering[0].id)"
22+
vpc_offering_id="$(cs listVPCOfferings name=Nuage | jq '.vpcoffering[0].id')"
2323
cs updateVPCOffering id=$vpc_offering_id state=Disabled

run.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ done
1111
sleep 3
1212

1313
export CLOUDSTACK_ENDPOINT=http://127.0.0.1:8096
14-
export CLOUDSTACK_KEY=""
15-
export CLOUDSTACK_SECRET=""
14+
export CLOUDSTACK_KEY=dummy
15+
export CLOUDSTACK_SECRET=dummy
1616

17-
admin_id="$(cs listUsers account=admin | jq .user[0].id)"
18-
cs getUserKeys id=$admin_id | jq .userkeys > /var/www/html/admin.json
17+
admin_id="$(cs listUsers account=admin | jq '.user[0].id')"
18+
cs getUserKeys id=$admin_id | jq '.userkeys' > /var/www/html/admin.json

0 commit comments

Comments
 (0)