x/cloudpulse
Code Issues Proposed changes

Adding container option for ceph check

Browse Source 
Change-Id: I1e25ea2937276b804a313979520ae419516a21c4
This commit is contained in:
Anand Shanmugam 2016-06-13 16:22:08 -07:00
parent 0ce5ef8faa
commit 18532c46e6
1 changed files with 9 additions and 1 deletions

10
cloudpulse/scenario/plugins/operator_tests/operator.py

@ -37,7 +37,9 @@ TESTS_OPTS = [
cfg.StrOpt('galera_container', cfg.StrOpt('galera_container',
default='mariadb_v1', default='mariadb_v1',
help='name of the galera cluster container'), help='name of the galera cluster container'),
cfg.StrOpt('ceph_container',
default='ceph_v1',
help='name of the ceph cluster container'),
] ]
PERIODIC_TESTS_OPTS = [ PERIODIC_TESTS_OPTS = [
@ -195,6 +197,12 @@ class operator_scenario(base.Scenario):
def ceph_check(self): def ceph_check(self):
self.load() self.load()
cmd = (r"ceph -f json status") 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']) out = self.ans_runner.execute(cmd, roles=['controller'])
results, failed_hosts = self.ans_runner.validate_results(out) results, failed_hosts = self.ans_runner.validate_results(out)