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 3083a84b19.		2018-07-20 10:07:15 +02:00
..
files	changed keyring name for glance	2018-06-29 14:03:44 +02:00
tasks	We actually need the merlin images	2018-07-20 10:07:15 +02:00
templates	small change in systemd-file glance-controller	2018-04-17 10:28:06 +02:00