starlingx/config
Code Issues Proposed changes

resize glance fails before controller-1 configured

Browse Source 
drbdadm's '--assume-peer-has-space' parameter is a backend
option but the required '--' command line prefix is missing

Closes-Bug: #1788916

Change-Id: I0c149c2e8de7695e9927658e7fe679f333bdda4a
Signed-off-by: Daniel Badea <daniel.badea@windriver.com>
This commit is contained in:
Daniel Badea 2018-08-27 13:39:58 +00:00
parent a05197752e
commit 03cdeb2f9b
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

@ -7283,11 +7283,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)