starlingx/config
Code Issues Proposed changes

Merge "resize glance fails before controller-1 configured"

Browse Source
This commit is contained in:
Zuul 2018-09-04 16:52:35 +00:00 committed by Gerrit Code Review
commit e3f3a9bed2
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sysinv/sysinv/sysinv/sysinv/conductor/manager.py
View File

@ -7293,11 +7293,10 @@ class ConductorManager(service.PeriodicService):
if not os.path.isfile(CFS_DRBDADM_RECONFIGURED): if not os.path.isfile(CFS_DRBDADM_RECONFIGURED):
progress = "drbdadm resize all" progress = "drbdadm resize all"
cmd = ["drbdadm", "resize", "all"]
if standby_host: if standby_host:
stdout, __ = cutils.execute(*cmd, attempts=retry_attempts, run_as_root=True) cmd = ["drbdadm", "resize", "all"]
else: else:
cmd = cmd + ['--assume-peer-has-space'] cmd = ["drbdadm", "--", "--assume-peer-has-space", "resize", "all"]
stdout, __ = cutils.execute(*cmd, attempts=retry_attempts, run_as_root=True) stdout, __ = cutils.execute(*cmd, attempts=retry_attempts, run_as_root=True)
LOG.info("Performed %s" % progress) LOG.info("Performed %s" % progress)
cutils.touch(CFS_DRBDADM_RECONFIGURED) cutils.touch(CFS_DRBDADM_RECONFIGURED)