Commit Graph

Select branches

Hide Pull Requests

feature/bagpipe

feature/federated-login

feature/federated-login-before-rebase

master

merlin

Mono Color

• 0dbcabb4a2 Added storage_availability_zone master Egon Rijpkema 2018-12-18 16:59:45 +0100
• 1920804c3c Instead of a mapped name... Egon Rijpkema 2018-12-14 16:15:30 +0100
• 4481b09bbc Moved availability zone to the correct docker. Egon Rijpkema 2018-12-13 14:03:06 +0100
• 52db295b69 Added availability zone option Egon Rijpkema 2018-12-11 10:04:04 +0100
• ce60b19fd2 Added a shibboleth attribute merlin Egon Rijpkema 2018-11-06 12:53:48 +0100
• 07def88ceb Add a merlin heat Egon Rijpkema 2018-10-08 16:50:13 +0200
• e9e1778a30 Add a merlin heat Egon Rijpkema 2018-10-08 16:50:13 +0200
• b502fb98e7 Filthy hack to make sure local settings are loaded. Egon Rijpkema 2018-09-26 13:47:49 +0200
• 3a1636bfee Added entry in /etc/hosts for merlin.hpc.rug.nl Egon Rijpkema 2018-09-25 10:54:42 +0200
• 77c512977f Build cinder controller Egon Rijpkema 2018-09-24 10:14:20 +0200
• 4426aed663 Build cinder controller Egon Rijpkema 2018-09-24 10:14:20 +0200
• 984c48d2e6 Updated auth_url to https in config files, too Egon Rijpkema 2018-09-24 09:55:01 +0200
• 4b29b7b061 Separate nova service for merlin Egon Rijpkema 2018-09-21 16:59:20 +0200
• 4e46364508 OS_AUTH_URL is https now Egon Rijpkema 2018-09-21 12:03:13 +0200
• d0cac71af4 Added ceph-common to cinder-storage. Egon Rijpkema 2018-09-20 16:45:08 +0200
• 17ee2aa487 Added ceph config for cinder controller. Egon Rijpkema 2018-09-17 13:25:44 +0200
• 455e10c7ab Add apache2 log to container log. Egon Rijpkema 2018-09-17 11:45:36 +0200
• d161a24200 Add apache2 log to container log. Egon Rijpkema 2018-09-17 11:45:36 +0200
• 71d2bc13ea make rbd secrets a variable secret to be set here. Egon Rijpkema 2018-09-13 16:13:21 +0200
• 5ae8a4cf1a Fixed typo Egon Rijpkema 2018-09-13 11:52:06 +0200
• 73e26ea716 changes to nova-compute-docker Wim Nap 2018-09-13 11:49:33 +0200
• 820d2ecb4d Added CA.crt Egon Rijpkema 2018-08-15 15:26:30 +0200
• f29afdb0b5 Add apache2 logs Egon Rijpkema 2018-08-15 14:41:02 +0200
• d98bcd7538 Logging convenience Egon Rijpkema 2018-08-15 14:05:36 +0200
• d51c52d35c Keystone merlin version (with federation) Egon Rijpkema 2018-08-10 16:16:09 +0200
• 32ed45e6e5 Keystone merlin version (with federation) Egon Rijpkema 2018-08-10 16:16:09 +0200
• 167d755724 Imported all shibboleth stuff from openstack-test05 Egon Rijpkema 2018-08-10 16:15:48 +0200
• c6c947ce3c updated name Egon Rijpkema 2018-08-10 14:04:40 +0200
• 33d630685b horizon user not present... Egon Rijpkema 2018-08-09 16:57:21 +0200
• 005c0f0c6a changed uuid for nova-compute Wim Nap 2018-08-09 16:47:08 +0200
• 2e372f3b78 Added merlin(federated) horizon. Egon Rijpkema 2018-08-09 13:19:25 +0200
• 510b68d156 Added merlin(federated) horizon. Egon Rijpkema 2018-08-09 13:19:25 +0200
• 8acb4813a1 Merge branch 'feature/federated-login-merlin' into merlin Egon Rijpkema 2018-08-09 12:09:58 +0200
• 776ce0b2d9 Changed tab into spaces. Egon Rijpkema 2018-08-09 11:53:26 +0200
• b1de9e17e5 Changes for a federated dashboard. Egon Rijpkema 2018-04-23 15:13:29 +0200
• 149590eb35 some changes to nova-compute docker Wim Nap 2018-08-08 15:43:03 +0200
• 4b13a2863a change in nova.conf to make changes to default security group Wim Nap 2018-07-25 11:30:27 +0200
• 2133462f17 Enableling router Egon Rijpkema 2018-07-23 15:49:08 +0200
• 7f49c6d706 Enableling router Egon Rijpkema 2018-07-23 15:49:08 +0200
• 5fdccce28b Took some config from master branch, i whink we need.... Egon Rijpkema 2018-07-23 14:28:51 +0200
• 216a954996 Revert "changed vxlan settings neutron-controller nova-compute" Egon Rijpkema 2018-07-19 10:32:01 +0200
• 7ecc7154a5 changed vxlan settings neutron-controller nova-compute Wim Nap 2018-07-16 15:42:51 +0200
• 2fc520a2ab Move the l3 agent to the neutron_controller Egon Rijpkema 2018-07-16 14:16:45 +0200
• e1c49aca56 make ceph variable Egon Rijpkema 2018-06-20 16:00:13 +0200
• 75434ae097 lower cpu_allocation ratio from 16 to 4 Egon Rijpkema 2018-06-18 14:57:25 +0200
• 046e1a59d9 Using cinder user. Egon Rijpkema 2018-05-04 14:06:24 +0200
• 4cce6b0485 add ceph-common to Dockerfile Wim Nap 2018-05-04 14:04:33 +0200
• 95c202133e changed rbd settings Wim Nap 2018-05-03 17:05:59 +0200
• 5c264bd448 changed rabbitmq host Wim Nap 2018-05-01 14:24:30 +0200
• f7c3d56cbf added merlin builds Egon Rijpkema 2018-04-24 09:53:30 +0200
• 90b394e456 added merlin builds Egon Rijpkema 2018-04-24 09:52:38 +0200
• 53bfd40ea6 Copy paste error... Egon Rijpkema 2018-04-23 16:56:06 +0200
• 00bb496ec5 Build all the dockers. Egon Rijpkema 2018-04-23 16:42:31 +0200
• 7e7ab04df0 Debugging Egon Rijpkema 2018-04-23 16:04:56 +0200
• f4f9b95d09 Dir needs a different name. Egon Rijpkema 2018-04-23 15:57:57 +0200
• 94113b8c25 Trying to adhere to python naming convention. Egon Rijpkema 2018-04-23 15:55:16 +0200
• 2de343d22d Trying to adhere to python naming convention. feature/federated-login-before-rebase feature/federated-login Egon Rijpkema 2018-04-23 15:54:54 +0200
• cd5e1783c8 Trying to adhere to python naming convention. feature/bagpipe Egon Rijpkema 2018-04-23 15:54:07 +0200
• 6a048fc437 Trying to adhere to python naming convention. Egon Rijpkema 2018-04-23 15:52:21 +0200
• d54af88505 Only one gitignore. Egon Rijpkema 2018-04-23 15:41:22 +0200
• d8073d485b Have a repo wide drone.yml Egon Rijpkema 2018-04-23 15:39:29 +0200
• 90a67e531d Docker in name is no longer needed Egon Rijpkema 2018-04-23 15:35:37 +0200
• 536df0decc Docker in name is no longer needed Egon Rijpkema 2018-04-23 15:35:21 +0200
• 9475b68c21 Docker in name is no longer needed Egon Rijpkema 2018-04-23 15:34:55 +0200
• 830e940fa2 Docker in name is no longer needed Egon Rijpkema 2018-04-23 15:33:12 +0200
• c961561812 Added l3 agent Egon Rijpkema 2018-04-23 15:19:43 +0200
• e2c62e15f0 Changes for a federated dashboard. Egon Rijpkema 2018-04-23 15:13:29 +0200
• 791595dcdf All changes in the merlin branches. Egon Rijpkema 2018-04-23 15:07:18 +0200
• b6c6533824 First commit Egon Rijpkema 2018-04-23 14:57:26 +0200