HPC/openstack_dockers
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: HPC:ce60b19fd2cf56347d7933a121dc49a3a6b37176
Branches Tags
HPC:master
HPC:merlin
HPC:feature/federated-login
HPC:feature/federated-login-before-rebase
HPC:feature/bagpipe
..
compare: HPC:b502fb98e77a44eb37acd75d5801e040d789007f
Branches Tags
HPC:master
HPC:merlin
HPC:feature/federated-login
HPC:feature/federated-login-before-rebase
HPC:feature/bagpipe

No commits in common. "ce60b19fd2cf56347d7933a121dc49a3a6b37176" and "b502fb98e77a44eb37acd75d5801e040d789007f" have entirely different histories.
ce60b19fd2 ... b502fb98e7

3 changed files with 1 additions and 14 deletions
Show Stats Expand all files Collapse all files

10
.drone.yml
View File

@ -174,16 +174,6 @@ pipeline:
tag: latest tag: latest
when: when:
branch: merlin 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: notify:
image: drillster/drone-email image: drillster/drone-email
host: smtp.rug.nl host: smtp.rug.nl

2
keystone/attribute-map.xml
View File

@ -10,8 +10,6 @@
<!-- Added for nikhef --> <!-- Added for nikhef -->
<Attribute name="openstackGroupEntitlements" id="openstackGroupEntitlements" nameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"/> <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: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"/> <Attribute name="urn:oid:2.5.4.4" nameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" id="Shib-surName"/>

3
keystone/keystone.conf
View File

@ -1,7 +1,6 @@
[DEFAULT] [DEFAULT]
verbose = true verbose = true
# debug = true
log_file = /var/log/keystone/keystone.log log_file = /var/log/keystone/keystone.log
[database] [database]
@ -14,7 +13,7 @@ provider = fernet
methods = password,token,mapped,openid,saml2 methods = password,token,mapped,openid,saml2
[federation] [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 sso_calback_template = /etc/keystone/sso_calback_template.html
[mapped] [mapped]