mon: secure cluster on container

Add the ability to protect pools on containerized clusters.

Signed-off-by: Sébastien Han <seb@redhat.com>

diff --git a/roles/ceph-mon/tasks/main.yml b/roles/ceph-mon/tasks/main.yml
index f25ff84590a992d1ba8b63a377e315327982a9d9..fbb92ce1e3ce28b78e023667b24b86ccaabf67ec 100644 (file)
--- a/roles/ceph-mon/tasks/main.yml
+++ b/roles/ceph-mon/tasks/main.yml
@@ -23,7 +23,6 @@
   run_once: true
   when:
     - secure_cluster
-    - not containerized_deployment
 
 - name: include docker/main.yml
   include_tasks: docker/main.yml

diff --git a/roles/ceph-mon/tasks/secure_cluster.yml b/roles/ceph-mon/tasks/secure_cluster.yml
index bdce4294655a49cf360c7f425947520025b9829d..f94005f54afb924e84ec45486e85487a375f8984 100644 (file)
--- a/roles/ceph-mon/tasks/secure_cluster.yml
+++ b/roles/ceph-mon/tasks/secure_cluster.yml
@@ -1,12 +1,14 @@
 ---
 - name: collect all the pools
-  command: rados --cluster {{ cluster }} lspools
+  command: >
+    {{ docker_exec_cmd }} rados --cluster {{ cluster }} lspools
   changed_when: false
   register: ceph_pools
   check_mode: no
 
 - name: secure the cluster
-  command: ceph --cluster {{ cluster }} osd pool set {{ item[0] }} {{ item[1] }} true
+  command: >
+    {{ docker_exec_cmd }} ceph --cluster {{ cluster }} osd pool set {{ item[0] }} {{ item[1] }} true
   changed_when: false
   with_nested:
     - "{{ ceph_pools.stdout_lines|default([]) }}"