fix simulator not in hypervisor.list

Author: resmo

Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:xenial-20180808
 
 MAINTAINER "René Moser" <[email protected]>
 

Makefile

@@ -1,4 +1,7 @@
 build:
+	docker build -t cloudstack-sim .
+
+build-no-cache:
 	docker build --no-cache -t cloudstack-sim .
 
 clean:

deploy.sh

@@ -10,3 +10,14 @@ done
 
 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=""
+
+# 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)"
+cs updateVPCOffering id=$vpc_offering_id state=Disabled

run.sh

@@ -1,20 +1,18 @@
 #!/bin/bash
+
+# In case the container was restarted
+rm -f /var/www/html/admin.json
+
 until nc -z localhost 8096; do
     echo "waiting for port 8096..."
     sleep 3
 done
 
 sleep 3
-if [ ! -e /var/www/html/admin.json ]
-then
-  export CLOUDSTACK_ENDPOINT=http://127.0.0.1:8096
-  export CLOUDSTACK_KEY=""
-  export CLOUDSTACK_SECRET=""
 
-  # Workaround for Nuage VPC Offering
-  vpc_offering_id="$(cs listVPCOfferings listall=true name=Nuage | jq .vpcoffering[0].id)"
-  cs updateVPCOffering id=$vpc_offering_id state=Disabled
+export CLOUDSTACK_ENDPOINT=http://127.0.0.1:8096
+export CLOUDSTACK_KEY=""
+export CLOUDSTACK_SECRET=""
 
-  admin_id="$(cs listUsers account=admin | jq .user[0].id)"
-  cs getUserKeys id=$admin_id | jq .userkeys > /var/www/html/admin.json
-fi
+admin_id="$(cs listUsers account=admin | jq .user[0].id)"
+cs getUserKeys id=$admin_id | jq .userkeys > /var/www/html/admin.json