git push --set-upstream origin merlin

roles/glance-controller/files/ceph.client.images.keyring

@@ -0,0 +1,9 @@
+$ANSIBLE_VAULT;1.1;AES256
+38396565316335323234336366643364636639306234383033383664383131343861326231633437
+3164323532393735663065313036316664623065383466310a393665393238323265316464393338
+35303535306434363538303032323366353138303363386463313364313864663535386138323634
+3138393163353063650a386532356566396636636365343065343934396163663732663965343038
+63343539643964656538396664633235636639356532616530613838613839623830396565656538
+62613236643632346539613036383230653431643733343737626666633532613030366462326430
+63303339373563366633363130363361643731303030323635323832333165363439623831316636
+64613533313664383164

roles/glance-controller/tasks/main.yml

@@ -6,7 +6,7 @@
     name: secrets
 
 - set_fact:
-    docker_image: registry.webhosting.rug.nl/hpc/openstack-glance:latest
+    docker_image: registry.webhosting.rug.nl/hpc/openstack-glance-merlin:latest
     env_vars: >
         -e "GLANCE_HOST={{ listen_ip | default(hostvars[groups['glance-controller'][0]]['ansible_default_ipv4']['address']) }}"
         -e "GLANCE_PASSWORD={{ secrets['GLANCE_PASSWORD'] }}"
@@ -20,10 +20,11 @@
         -e "RABBIT_PASSWORD={{ secrets['RABBIT_PASSWORD'] }}"
         -e "RABBIT_USER=openstack"
 
-- name: pull docker image
-  docker_image:
-    name: "{{ docker_image }}"
-  tags: pull
+
+#- name: pull docker image
+#  docker_image:
+#    name: "{{ docker_image }}"
+#  tags: pull
 
 - name: Make build and persistent directories
   file:
@@ -33,6 +34,7 @@
   with_items:
       - /srv/glance
       - /srv/glance/root
+      - /srv/glance/etc/ceph
 
 - name: install service file.
   template:

roles/glance-controller/templates/glance.service

@@ -11,7 +11,7 @@ ExecStartPre=-/usr/bin/docker rm %n
 ExecStart=/usr/bin/docker run --name %n \
   {{ env_vars | replace('\n', '') }} \
   -v /srv/glance/root:/root \
-  -v /var/lib/glance/images:/var/lib/glance/images \
+  -v /srv/glance/etc/ceph:/etc/ceph \
   -p 9292:9292 \
   {{ docker_image }}