Merge pull request #597 from tonytan4ever/INSIGHTS-222-enable-ceph-os…

…d-checks INSIGHTS-222-enable-ceph-osd-on-osp-13
rcbops · Dec 5, 2018 · b2e8b82 · b2e8b82
2 parents cb6f5cf + 4bc8234
commit b2e8b82
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/playbooks/files/rax-maas/plugins/ceph_monitoring.py b/playbooks/files/rax-maas/plugins/ceph_monitoring.py
@@ -34,7 +34,7 @@ def check_command(command, container_name=None, deploy_osp=False):
                              '-c']
         container_command.append("{}".format(' '.join(command)))
         if deploy_osp:
-            container_command = ['sudo', 'docker', 'exec', container_name]
+            container_command = []
             container_command.extend(command)
         command = [str(i) for i in container_command]
     output = subprocess.check_output(command, stderr=subprocess.STDOUT)

diff --git a/releasenotes/notes/INSIGHTS-222-enable-ceph-osd-checks-f3fcbd0d90190185.yaml b/releasenotes/notes/INSIGHTS-222-enable-ceph-osd-checks-f3fcbd0d90190185.yaml
@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    Ceph commands for cech checks needs to run on the host not, not inside
+    ceph docker container on osp-13.  This PR fix that and enable ceph 
+    checks for osp-13 gates. 
diff --git a/tests/user_osp_13_deploy_vars.yml b/tests/user_osp_13_deploy_vars.yml
@@ -23,7 +23,6 @@ maas_excluded_checks:
   - 'filesystem_/var/lib/docker/overlay2'
   - 'filesystem_/var/lib/docker/containers'
   - galera_check
-  - ceph_osd_stats
 
 maas_pre_flight_check_enabled: true