From 505cecb339b53468e349624b69c156984a18bbf8 Mon Sep 17 00:00:00 2001 From: Jiri Stransky Date: Tue, 26 Sep 2017 15:00:13 +0200 Subject: Switch scenario004-containers to use ceph-ansible MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use ceph-ansible to match the non-containerized variant of scenario004. Depends-On: I137ca9a005df6e95a59a4d629eb94bda6ef00d3a Depends-On: I6acac1826271efcd4d1acf6633bde6eb8a653f44 Co-Authored-By: Martin André Co-Authored-By: Giulio Fidente Change-Id: I1b3c57a2cfda9e74457f17504f51d5b30c5d381d (cherry picked from commit 4e85813d368b94f588471d9bdc4a04d04d3be541) --- ci/environments/scenario001-multinode-containers.yaml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'ci/environments/scenario001-multinode-containers.yaml') diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml index df12bc59..de265263 100644 --- a/ci/environments/scenario001-multinode-containers.yaml +++ b/ci/environments/scenario001-multinode-containers.yaml @@ -95,20 +95,14 @@ parameter_defaults: # This makes the job twice as fast ceilometer::agent::polling::polling_interval: 15 Debug: true - #NOTE(gfidente): not great but we need this to deploy on ext4 - #http://docs.ceph.com/docs/jewel/rados/configuration/filesystem-recommendations/ CephAnsibleDisksConfig: devices: - /dev/loop3 journal_size: 512 osd_scenario: collocated + CephPoolDefaultPgNum: 32 + CephPoolDefaultSize: 1 CephAnsibleExtraConfig: - ceph_conf_overrides: - global: - osd_pool_default_size: 1 - osd_pool_default_pg_num: 32 - osd_max_object_name_len: 256 - osd_max_object_namespace_len: 64 centos_package_dependencies: [] CephAnsibleSkipTags: '' #NOTE: These ID's and keys should be regenerated for @@ -118,8 +112,6 @@ parameter_defaults: CephMonKey: 'AQC+Ox1VmEr3BxAALZejqeHj50Nj6wJDvs96OQ==' CephAdminKey: 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ==' CephClientKey: 'AQC+vYNXgDAgAhAAc8UoYt+OTz5uhV7ItLdwUw==' - CephPoolDefaultSize: 1 - DockerCephDaemonImage: ceph/daemon:tag-stable-3.0-jewel-centos-7 NovaEnableRbdBackend: true CinderEnableRbdBackend: true CinderBackupBackend: ceph -- cgit 1.2.3-korg