Added storage_availability_zone

we're using the actual device name now.

.drone.yml

@@ -94,6 +94,26 @@ pipeline:
     tag: latest
     when:
       branch: master
+  keystone_merlin:
+    image: plugins/docker
+    dockerfile: keystone/Dockerfile
+    context: keystone
+    secrets: [docker_username, docker_password]
+    registry: registry.webhosting.rug.nl
+    repo: registry.webhosting.rug.nl/hpc/openstack-keystone-merlin
+    tag: latest
+    when:
+      branch: merlin
+  horizon_merlin:
+    image: plugins/docker
+    dockerfile: horizon/Dockerfile
+    context: horizon
+    secrets: [docker_username, docker_password]
+    registry: registry.webhosting.rug.nl
+    repo: registry.webhosting.rug.nl/hpc/openstack-horizon-merlin
+    tag: latest
+    when:
+      branch: merlin
   neutron_controller_merlin:
     image: plugins/docker
     dockerfile: neutron_controller/Dockerfile
@@ -104,6 +124,16 @@ pipeline:
     tag: latest
     when:
       branch: merlin
+  cinder_controller_merlin:
+    image: plugins/docker
+    dockerfile: cinder_controller/Dockerfile
+    context: cinder_controller
+    secrets: [docker_username, docker_password]
+    registry: registry.webhosting.rug.nl
+    repo: registry.webhosting.rug.nl/hpc/openstack-cinder-controller-merlin
+    tag: latest
+    when:
+      branch: mwelin
   cinder_storage_merlin:
     image: plugins/docker
     dockerfile: cinder_storage/Dockerfile
@@ -134,6 +164,16 @@ pipeline:
     tag: latest
     when:
       branch: merlin
+  heat_merlin:
+    image: plugins/docker
+    dockerfile: heat/Dockerfile
+    context: heat
+    secrets: [docker_username, docker_password]
+    registry: registry.webhosting.rug.nl
+    repo: registry.webhosting.rug.nl/hpc/openstack-heat-merlin
+    tag: latest
+    when:
+      branch: merlin
   notify:
     image: drillster/drone-email
     host: smtp.rug.nl

cinder_controller/run.sh

@@ -7,6 +7,7 @@ cinder-scheduler -d &
 sleep 5
 apachectl -DFOREGROUND &
 
+tail -f /var/log/apache2/* &
 # If any process fails, kill the rest.
 # This ensures the container stops and systemd will restart it.
 

cinder_storage/bootstrap.sh

@@ -22,6 +22,6 @@ source /root/admin-openrc.sh
 
 # create a LVM physical volume and volume group.
 # This device should be available tpo the container
-pvcreate /dev/cinder_storage_volume
+pvcreate $CINDER_STORAGE_VOLUME
-vgcreate cinder-volumes /dev/cinder_storage_volume
+vgcreate cinder-volumes $CINDER_STORAGE_VOLUME
 

cinder_storage/write_conf.sh

@@ -9,6 +9,7 @@ cat << EOF > /etc/cinder/cinder.conf
 connection = mysql+pymysql://$CINDER_USER:$CINDER_PASSWORD@$MYSQL_HOST/cinder
 
 [DEFAULT]
+storage_availability_zone="$AVAILABILITY_ZONE"
 auth_strategy = keystone
 transport_url = rabbit://$RABBIT_USER:$RABBIT_PASSWORD@$RABBIT_HOST
 my_ip = $MY_IP