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)

diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml
index cbbc521..3b6c2b8 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:

diff --git a/docker/services/ceph-ansible/ceph-mon.yaml b/docker/services/ceph-ansible/ceph-mon.yaml
index 45f939c..90b2db3 100644 (file)
--- 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 a441f5c..de55924 100644 (file)
--- 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: