.drone.yml

@@ -174,16 +174,6 @@ 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

keystone/attribute-map.xml

@@ -10,8 +10,6 @@
 
   <!-- Added for nikhef -->
   <Attribute name="openstackGroupEntitlements" id="openstackGroupEntitlements" nameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"/>
-  <!-- Added after mail 18-10-2018 -->
-  <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" id="eppn" nameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"/>
 
   <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10"     nameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" id="Shib-user"/>
   <Attribute name="urn:oid:2.5.4.4"                       nameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" id="Shib-surName"/>

keystone/keystone.conf

@@ -1,7 +1,6 @@
 [DEFAULT]
 
 verbose = true
-# debug = true
 log_file = /var/log/keystone/keystone.log
 
 [database]
@@ -14,7 +13,7 @@ provider = fernet
 methods = password,token,mapped,openid,saml2
 
 [federation]
-trusted_dashboard = https://merlin.hpc.rug.nl/horizon/auth/websso/
+trusted_dashboard = http://merlin.hpc.rug.nl/horizon/auth/websso/
 sso_calback_template = /etc/keystone/sso_calback_template.html
 
 [mapped]