From 18532c46e68c331cc21acfcfc01ac989d6b2062a Mon Sep 17 00:00:00 2001 From: Anand Shanmugam Date: Mon, 13 Jun 2016 16:22:08 -0700 Subject: [PATCH] Adding container option for ceph check Change-Id: I1e25ea2937276b804a313979520ae419516a21c4 --- cloudpulse/scenario/plugins/operator_tests/operator.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/cloudpulse/scenario/plugins/operator_tests/operator.py b/cloudpulse/scenario/plugins/operator_tests/operator.py index 5f12fbc..d129451 100644 --- a/cloudpulse/scenario/plugins/operator_tests/operator.py +++ b/cloudpulse/scenario/plugins/operator_tests/operator.py @@ -37,7 +37,9 @@ TESTS_OPTS = [ cfg.StrOpt('galera_container', default='mariadb_v1', help='name of the galera cluster container'), - + cfg.StrOpt('ceph_container', + default='ceph_v1', + help='name of the ceph cluster container'), ] PERIODIC_TESTS_OPTS = [ @@ -195,6 +197,12 @@ class operator_scenario(base.Scenario): def ceph_check(self): self.load() cmd = (r"ceph -f json status") + + is_containerized = cfg.CONF.operator_test.containerized + if is_containerized: + ceph_container = cfg.CONF.operator_test.ceph_container + cmd = ("docker exec %s %s" % (ceph_container, cmd)) + out = self.ans_runner.execute(cmd, roles=['controller']) results, failed_hosts = self.ans_runner.validate_results(out)