Skip to content

Commit b2e8b82

Browse files
authored
Merge pull request #597 from tonytan4ever/INSIGHTS-222-enable-ceph-osd-checks
INSIGHTS-222-enable-ceph-osd-on-osp-13
2 parents cb6f5cf + 4bc8234 commit b2e8b82

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

playbooks/files/rax-maas/plugins/ceph_monitoring.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def check_command(command, container_name=None, deploy_osp=False):
3434
'-c']
3535
container_command.append("{}".format(' '.join(command)))
3636
if deploy_osp:
37-
container_command = ['sudo', 'docker', 'exec', container_name]
37+
container_command = []
3838
container_command.extend(command)
3939
command = [str(i) for i in container_command]
4040
output = subprocess.check_output(command, stderr=subprocess.STDOUT)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
features:
3+
- |
4+
Ceph commands for cech checks needs to run on the host not, not inside
5+
ceph docker container on osp-13. This PR fix that and enable ceph
6+
checks for osp-13 gates.

tests/user_osp_13_deploy_vars.yml

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ maas_excluded_checks:
2323
- 'filesystem_/var/lib/docker/overlay2'
2424
- 'filesystem_/var/lib/docker/containers'
2525
- galera_check
26-
- ceph_osd_stats
2726

2827
maas_pre_flight_check_enabled: true
2928

0 commit comments

Comments
 (0)