From 1732dd98ef31782bed6bc02e61579f2b66ce39a2 Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Wed, 6 Sep 2017 08:47:40 +0200 Subject: Remove monitor_interface from ceph-ansible parameters We should not pass any hardcoded value for monitor_interface and rely on monitor_address_block only instead. Also removes journal_collocation which is not consumed by newer (and stable) builds of ceph-ansible. Change-Id: Idf213a1f43a66506f76d07102f122839b5096948 Closes-Bug: #1715246 (cherry picked from commit 3e90ae3df5a7c5491672254733ceac163b34a395) --- ci/environments/scenario001-multinode-containers.yaml | 1 - docker/services/ceph-ansible/ceph-mon.yaml | 1 - docker/services/ceph-ansible/ceph-osd.yaml | 1 - 3 files changed, 3 deletions(-) diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml index cbbc5216..3b6c2b86 100644 --- 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: diff --git a/docker/services/ceph-ansible/ceph-mon.yaml b/docker/services/ceph-ansible/ceph-mon.yaml index 45f939c2..90b2db3b 100644 --- a/docker/services/ceph-ansible/ceph-mon.yaml +++ b/docker/services/ceph-ansible/ceph-mon.yaml @@ -83,4 +83,3 @@ outputs: - {get_attr: [CephBase, role_data, config_settings, ceph_common_ansible_vars]} - monitor_secret: {get_param: CephMonKey} admin_secret: {get_param: CephAdminKey} - monitor_interface: br_ex diff --git a/docker/services/ceph-ansible/ceph-osd.yaml b/docker/services/ceph-ansible/ceph-osd.yaml index a441f5c9..de55924b 100644 --- a/docker/services/ceph-ansible/ceph-osd.yaml +++ b/docker/services/ceph-ansible/ceph-osd.yaml @@ -37,7 +37,6 @@ parameters: devices: - /dev/vdb journal_size: 512 - journal_collocation: true osd_scenario: collocated resources: -- cgit 1.2.3-korg