From 5758bbb7f7c0c09141cac6fde153aa1a282510a0 Mon Sep 17 00:00:00 2001
From: Egon Rijpkema <git@egonrijpkema.nl>
Date: Mon, 17 Sep 2018 13:45:13 +0200
Subject: [PATCH] We have a separate cinder-controller for merlin.

---
 roles/cinder-controller/tasks/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/cinder-controller/tasks/main.yml b/roles/cinder-controller/tasks/main.yml
index 5f65fca..1243633 100644
--- a/roles/cinder-controller/tasks/main.yml
+++ b/roles/cinder-controller/tasks/main.yml
@@ -8,7 +8,7 @@
     - facts
 
 - set_fact:
-    docker_image: registry.webhosting.rug.nl/hpc/openstack-cinder-controller:latest
+    docker_image: registry.webhosting.rug.nl/hpc/openstack-cinder-controller-merlin:latest
     env_vars: >
         -e "MY_IP={{ listen_ip | default(ansible_default_ipv4.address) }}"
         -e "CINDER_HOST={{ listen_ip | default(hostvars[groups['cinder-controller'][0]]['ansible_default_ipv4']['address']) }}"