LGTM, thanks
On Tue, Jun 03, 2014 at 12:33:33PM +0200, 'Klaus Aehlig' via ganeti-devel wrote: > During master-failover, we need to read the configuration. This > is done by temporarily starting wconfd on the wrong (i.e., the > not yet master) node. As wconfd is now paranoid about not running > on the master node, tell it, that, in this case, it really is OK. > > Signed-off-by: Klaus Aehlig <[email protected]> > --- > lib/bootstrap.py | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/lib/bootstrap.py b/lib/bootstrap.py > index b239f14..f4a801b 100644 > --- a/lib/bootstrap.py > +++ b/lib/bootstrap.py > @@ -1025,9 +1025,10 @@ def MasterFailover(no_voting=False): > logging.info("Setting master to %s, old master: %s", new_master, > old_master) > > try: > - # Start WConfd so that we can access the configuration > + # Forcefully start WConfd so that we can access the configuration > result = utils.RunCmd([pathutils.DAEMON_UTIL, > - "start", constants.WCONFD, "--force-node"]) > + "start", constants.WCONFD, "--force-node", > + "--no-voting", "--yes-do-it"]) > if result.failed: > raise errors.OpPrereqError("Could not start the configuration daemon," > " command %s had exitcode %s and error %s" % > -- > 1.9.1.423.g4596e3a >
