Egon Rijpkema 38936554bd We actually need the merlin images ...

It's needed for ceph, for instance

Revert "Reverting to standard docker images"

This reverts commit 3083a84b19eb583d0a380e2b92106dda6e7015ad.

2018-07-20 10:07:15 +02:00

..

files

new ceph.conf for nova-compute and cinder-storage

2018-04-16 17:08:49 +02:00

tasks

We actually need the merlin images

2018-07-20 10:07:15 +02:00

templates

some ceph changes

2018-07-06 09:56:05 +02:00