Commit Graph

38 Commits

Author SHA1 Message Date
Egon Rijpkema
984c48d2e6 Updated auth_url to https in config files, too 2018-09-24 09:55:01 +02:00
Egon Rijpkema
4b29b7b061 Separate nova service for merlin 2018-09-21 16:59:20 +02:00
Egon Rijpkema
4e46364508 OS_AUTH_URL is https now 2018-09-21 16:24:23 +02:00
Egon Rijpkema
d0cac71af4 Added ceph-common to cinder-storage. 2018-09-20 16:45:08 +02:00
Egon Rijpkema
17ee2aa487 Added ceph config for cinder controller. 2018-09-17 13:25:44 +02:00
Egon Rijpkema
d161a24200 Add apache2 log to container log. 2018-09-17 11:45:36 +02:00
Egon Rijpkema
71d2bc13ea make rbd secrets a variable secret to be set here. 2018-09-13 16:13:49 +02:00
Egon Rijpkema
5ae8a4cf1a Fixed typo 2018-09-13 11:52:18 +02:00
Wim Nap
73e26ea716 changes to nova-compute-docker 2018-09-13 11:49:54 +02:00
Egon Rijpkema
820d2ecb4d Added CA.crt 2018-08-15 15:31:28 +02:00
Egon Rijpkema
f29afdb0b5 Add apache2 logs 2018-08-15 14:41:02 +02:00
Egon Rijpkema
d98bcd7538 Logging convenience 2018-08-15 14:20:24 +02:00
Egon Rijpkema
32ed45e6e5 Keystone merlin version (with federation) 2018-08-10 16:16:09 +02:00
Egon Rijpkema
167d755724 Imported all shibboleth stuff from openstack-test05 2018-08-10 16:15:48 +02:00
Egon Rijpkema
c6c947ce3c updated name 2018-08-10 14:04:40 +02:00
Egon Rijpkema
33d630685b horizon user not present... 2018-08-09 16:57:30 +02:00
Wim Nap
005c0f0c6a changed uuid for nova-compute 2018-08-09 16:47:39 +02:00
Egon Rijpkema
2e372f3b78 Added merlin(federated) horizon. 2018-08-09 13:20:02 +02:00
Egon Rijpkema
8acb4813a1 Merge branch 'feature/federated-login-merlin' into merlin 2018-08-09 12:09:58 +02:00
Egon Rijpkema
776ce0b2d9 Changed tab into spaces. 2018-08-09 12:05:40 +02:00
Egon Rijpkema
b1de9e17e5 Changes for a federated dashboard. 2018-08-09 12:05:40 +02:00
Wim Nap
149590eb35 some changes to nova-compute docker 2018-08-08 15:43:03 +02:00
Wim Nap
4b13a2863a change in nova.conf to make changes to default security group 2018-07-25 11:56:07 +02:00
Egon Rijpkema
2133462f17 Enableling router 2018-07-23 15:50:57 +02:00
Egon Rijpkema
5fdccce28b Took some config from master branch, i whink we need.... 2018-07-23 14:28:51 +02:00
Egon Rijpkema
216a954996 Revert "changed vxlan settings neutron-controller nova-compute"
This reverts commit 7ecc7154a5.
2018-07-19 10:32:01 +02:00
Wim Nap
7ecc7154a5 changed vxlan settings neutron-controller nova-compute 2018-07-16 15:42:51 +02:00
Egon Rijpkema
2fc520a2ab Move the l3 agent to the neutron_controller 2018-07-16 14:16:45 +02:00
Egon Rijpkema
e1c49aca56 make ceph variable 2018-06-20 16:00:13 +02:00
Egon Rijpkema
046e1a59d9 Using cinder user. 2018-05-04 14:06:24 +02:00
Wim Nap
4cce6b0485 add ceph-common to Dockerfile 2018-05-04 14:04:33 +02:00
Wim Nap
95c202133e changed rbd settings 2018-05-03 17:05:59 +02:00
Wim Nap
5c264bd448 changed rabbitmq host 2018-05-01 14:24:30 +02:00
Egon Rijpkema
f7c3d56cbf added merlin builds 2018-04-24 09:53:30 +02:00
Egon Rijpkema
94113b8c25 Trying to adhere to python naming convention. 2018-04-23 15:55:16 +02:00
Egon Rijpkema
90a67e531d Docker in name is no longer needed 2018-04-23 15:35:37 +02:00
Egon Rijpkema
791595dcdf All changes in the merlin branches. 2018-04-23 15:07:18 +02:00
Egon Rijpkema
b6c6533824 First commit
(Contains all the master branches of the previous repositories)
2018-04-23 14:57:26 +02:00