File tree 3 files changed +10
-10
lines changed
3 files changed +10
-10
lines changed Original file line number Diff line number Diff line change 1
- FROM ubuntu:xenial-20180808
1
+ FROM ubuntu:xenial-20181113
2
2
3
3
MAINTAINER "René Moser" <
[email protected] >
4
4
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
6
6
7
7
RUN echo 'mysql-server mysql-server/root_password password root' | debconf-set-selections; \
8
8
echo 'mysql-server mysql-server/root_password_again password root' | debconf-set-selections;
@@ -59,7 +59,7 @@ RUN (/usr/bin/mysqld_safe &); \
59
59
60
60
COPY zones.cfg /opt/zones.cfg
61
61
COPY nginx_default.conf /etc/nginx/sites-available/default
62
- RUN pip install cs==2.3.1
62
+ RUN pip install cs==2.5
63
63
COPY run.sh /opt/run.sh
64
64
COPY deploy.sh /opt/deploy.sh
65
65
COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
Original file line number Diff line number Diff line change @@ -12,12 +12,12 @@ sleep 3
12
12
python /opt/cloudstack/tools/marvin/marvin/deployDataCenter.py -i /opt/zones.cfg
13
13
14
14
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
17
17
18
18
# Add Simulator to supported hypervisors exclusively
19
19
cs updateConfiguration name=hypervisor.list value=Simulator
20
20
21
21
# 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' ) "
23
23
cs updateVPCOffering id=$vpc_offering_id state=Disabled
Original file line number Diff line number Diff line change 11
11
sleep 3
12
12
13
13
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
16
16
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
You can’t perform that action at this time.
0 commit comments