Merge "nova-placement: switch auth_uri to keystone versionless endpoint" into stable...

[apex-tripleo-heat-templates.git] / ci / environments / scenario001-multinode-containers.yaml

diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml
index cbbc521..df12bc5 100644 (file)
--- a/ci/environments/scenario001-multinode-containers.yaml
+++ b/ci/environments/scenario001-multinode-containers.yaml
@@ -101,7 +101,6 @@ parameter_defaults:
     devices:
       - /dev/loop3
     journal_size: 512
-    journal_collocation: true
     osd_scenario: collocated
   CephAnsibleExtraConfig:
     ceph_conf_overrides:
@@ -120,7 +119,7 @@ parameter_defaults:
   CephAdminKey: 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ=='
   CephClientKey: 'AQC+vYNXgDAgAhAAc8UoYt+OTz5uhV7ItLdwUw=='
   CephPoolDefaultSize: 1
-  DockerCephDaemonImage: ceph/daemon:tag-build-ceph-dfg-jewel-centos-7
+  DockerCephDaemonImage: ceph/daemon:tag-stable-3.0-jewel-centos-7
   NovaEnableRbdBackend: true
   CinderEnableRbdBackend: true
   CinderBackupBackend: ceph