From 32ed45e6e514aae764f2fa0c3dd07a90985d6403 Mon Sep 17 00:00:00 2001
From: Egon Rijpkema <git@egonrijpkema.nl>
Date: Fri, 10 Aug 2018 16:16:09 +0200
Subject: [PATCH] Keystone merlin version (with federation)

---
 .drone.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.drone.yml b/.drone.yml
index dfa25b0..829c491 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -94,6 +94,16 @@ 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