Commit 8925faaa authored by Iustin Pop's avatar Iustin Pop

Some small fixes.

It fixes the main Makefile.am to create $localstatedir/{lib,log}/ganeti.
It fixes the testing Makefile.am after the rename fake_config.py ->
mocks.py.  It strips the output of "ip link show" to have a nicer output
if the master netdev does not exist.
parent a7a19281
......@@ -15,3 +15,6 @@ depgraph.ps: depgraph.dot
depgraph.dot: ganeti/*.py
pylint.python2.4 --indent-string ' ' --rcfile=/dev/null \
--reports y --int-import-graph $@ --persistent n ganeti >/dev/null
install-exec-local:
@mkdir_p@ ${localstatedir}/lib/ganeti ${localstatedir}/log/ganeti
......@@ -580,7 +580,8 @@ class LUInitCluster(LogicalUnit):
result = utils.RunCmd(["ip", "link", "show", "dev", self.op.master_netdev])
if result.failed:
raise errors.OpPrereqError("Invalid master netdev given (%s): '%s'" %
(self.op.master_netdev, result.output))
(self.op.master_netdev,
result.output.strip()))
def Exec(self, feedback_fn):
"""Initialize the cluster.
......
......@@ -6,4 +6,4 @@ ganeti:
rm -f ganeti
ln -s $(top_srcdir)/lib ganeti
EXTRA_DIST = $(TESTS) fake_config.py ganeti.qa.py qa-sample.yaml
EXTRA_DIST = $(TESTS) mocks.py ganeti.qa.py qa-sample.yaml
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment