From 03cdeb2f9b0ebddf66db3e862e73690bd35fecbf Mon Sep 17 00:00:00 2001 From: Daniel Badea Date: Mon, 27 Aug 2018 13:39:58 +0000 Subject: [PATCH] resize glance fails before controller-1 configured 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 --- sysinv/sysinv/sysinv/sysinv/conductor/manager.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sysinv/sysinv/sysinv/sysinv/conductor/manager.py b/sysinv/sysinv/sysinv/sysinv/conductor/manager.py index a82425ca5f..a63446410d 100644 --- a/sysinv/sysinv/sysinv/sysinv/conductor/manager.py +++ b/sysinv/sysinv/sysinv/sysinv/conductor/manager.py @@ -7283,12 +7283,11 @@ class ConductorManager(service.PeriodicService): if not os.path.isfile(CFS_DRBDADM_RECONFIGURED): progress = "drbdadm resize all" - cmd = ["drbdadm", "resize", "all"] if standby_host: - stdout, __ = cutils.execute(*cmd, attempts=retry_attempts, run_as_root=True) + cmd = ["drbdadm", "resize", "all"] else: - cmd = cmd + ['--assume-peer-has-space'] - stdout, __ = cutils.execute(*cmd, attempts=retry_attempts, run_as_root=True) + cmd = ["drbdadm", "--", "--assume-peer-has-space", "resize", "all"] + stdout, __ = cutils.execute(*cmd, attempts=retry_attempts, run_as_root=True) LOG.info("Performed %s" % progress) cutils.touch(CFS_DRBDADM_RECONFIGURED)