| commit | 7bfa7a491e8569d65c783c91c6619129895f975f | [log] [tgz] |
|---|---|---|
| author | harhipova <harhipova@mirantis.com> | Mon Sep 07 14:26:37 2020 +0000 |
| committer | Gerrit Code Review <mail@domain.com> | Mon Sep 07 14:26:37 2020 +0000 |
| tree | 05952fffd4b63fafd6555cbd1f75411dd5a8f760 | |
| parent | 168fc023259eb5676fe3054699e4089048b2fa9b [diff] | |
| parent | 134b73982a0c03754f41fe09a9f84f7a00c1c672 [diff] |
Merge "Add rbd_monitoring_enabled for Ceph Nautilus"
diff --git a/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml b/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml index 730fc39..46c1b7e 100644 --- a/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml +++ b/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
@@ -774,6 +774,7 @@ ceph_enabled: 'True' ceph_version: "nautilus" ceph_hyper_converged: "False" + rbd_monitoring_enabled: 'True' # Apply settings for ceph from contexts/ceph/nautilus-collocated-block-db.yml ceph_osd_backend: "bluestore" ceph_osds_per_device: '1'
diff --git a/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml index 683d502..4d93719 100644 --- a/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml +++ b/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
@@ -44,6 +44,7 @@ ceph_mon_node02_hostname: cmn02 ceph_mon_node03_address: 10.167.4.68 ceph_mon_node03_hostname: cmn03 + rbd_monitoring_enabled: 'True' # Apply changes for ceph from contexts/ceph/nautilus-encrypted-devices.yml ceph_osd_backend: bluestore ceph_osds_per_device: '3'
diff --git a/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml index c8ba8c6..3c39011 100644 --- a/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml +++ b/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
@@ -44,6 +44,7 @@ ceph_mon_node02_hostname: cmn02 ceph_mon_node03_address: 10.167.4.68 ceph_mon_node03_hostname: cmn03 + rbd_monitoring_enabled: 'True' # Apply changes for ceph from contexts/ceph/nautilus-encrypted-devices.yml ceph_osd_backend: bluestore ceph_osds_per_device: '3'