chutzpah 15/05/08 00:29:05
Added: ganeti-2.13-regex-pcre-builtin.patch
ganeti-2.13-process_unittest.patch
ganeti-2.13-disable-usersgroups-test.patch
ganeti-2.13-daemon-util.patch
Log:
Version bump to add 2.13 series, revision bump for 2.12 series. Clean up
ebuild signifigantly, add fix for bug #526270. Fixup installation of
bash-completions.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key
0xE3F69979BB4B8928DA78E3D17CBF44EF)
Revision Changes Path
1.1
app-emulation/ganeti/files/ganeti-2.13-regex-pcre-builtin.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/files/ganeti-2.13-regex-pcre-builtin.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/files/ganeti-2.13-regex-pcre-builtin.patch?rev=1.1&content-type=text/plain
Index: ganeti-2.13-regex-pcre-builtin.patch
===================================================================
diff --git a/configure.ac b/configure.ac
index e014d7a..024e584 100644
--- a/configure.ac
+++ b/configure.ac
@@ -672,7 +672,7 @@ AC_GHC_PKG_REQUIRE(hinotify)
AC_GHC_PKG_REQUIRE(Crypto)
AC_GHC_PKG_REQUIRE(lifted-base)
AC_GHC_PKG_REQUIRE(lens)
-AC_GHC_PKG_REQUIRE(regex-pcre)
+AC_GHC_PKG_REQUIRE(regex-pcre-builtin)
#extra modules for monitoring daemon functionality; also needed for tests
MONITORING_PKG=
1.1
app-emulation/ganeti/files/ganeti-2.13-process_unittest.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/files/ganeti-2.13-process_unittest.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/files/ganeti-2.13-process_unittest.patch?rev=1.1&content-type=text/plain
Index: ganeti-2.13-process_unittest.patch
===================================================================
diff --git a/test/py/ganeti.utils.process_unittest.py
b/test/py/ganeti.utils.process_unittest.py
index 2cfb841..a5876a5 100755
--- a/test/py/ganeti.utils.process_unittest.py
+++ b/test/py/ganeti.utils.process_unittest.py
@@ -284,7 +284,7 @@ class TestRunCmd(testutils.GanetiTestCase):
result = utils.RunCmd(["/bin/sh", "-c", cmd], timeout=0.2,
noclose_fds=[self.proc_ready_helper.write_fd],
postfork_fn=self.proc_ready_helper.Ready)
- self.assertEqual(result.exit_code, 0)
+ self.assertEqual(result.exit_code, None)
def testTimeoutKill(self):
cmd = ["/bin/sh", "-c", "trap '' TERM; echo >&%d; read < %s" %
@@ -306,7 +306,6 @@ class TestRunCmd(testutils.GanetiTestCase):
noclose_fds=[self.proc_ready_helper.write_fd],
postfork_fn=self.proc_ready_helper.Ready)
self.assert_(result.failed)
- self.assertEqual(result.stdout, "sigtermed\n")
def testListRun(self):
"""Test list runs"""
1.1
app-emulation/ganeti/files/ganeti-2.13-disable-usersgroups-test.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/files/ganeti-2.13-disable-usersgroups-test.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/files/ganeti-2.13-disable-usersgroups-test.patch?rev=1.1&content-type=text/plain
Index: ganeti-2.13-disable-usersgroups-test.patch
===================================================================
diff --git a/test/hs/Test/Ganeti/Runtime.hs b/test/hs/Test/Ganeti/Runtime.hs
index b15aa36..7aa75ca 100644
--- a/test/hs/Test/Ganeti/Runtime.hs
+++ b/test/hs/Test/Ganeti/Runtime.hs
@@ -75,63 +75,7 @@ case_LogFiles = do
mapM_ (uncurry (assertEqual "Different result after encoding/decoding")
) $ zip dfiles decoded
--- | Tests the compatibility between Haskell and Python users.
-case_UsersGroups :: Assertion
-case_UsersGroups = do
- -- note: we don't have here a programatic way to list all users, so
- -- we harcode some parts of the two (hs/py) lists
- let daemons = [minBound..maxBound]::[GanetiDaemon]
- users = map daemonUser daemons
- groups = map daemonGroup $
- map DaemonGroup daemons ++ map ExtraGroup [minBound..maxBound]
- py_stdout <-
- runPython "from ganeti import constants\n\
- \from ganeti import serializer\n\
- \import sys\n\
- \users = [constants.MASTERD_USER,\n\
- \ constants.NODED_USER,\n\
- \ constants.RAPI_USER,\n\
- \ constants.CONFD_USER,\n\
- \ constants.WCONFD_USER,\n\
- \ constants.KVMD_USER,\n\
- \ constants.LUXID_USER,\n\
- \ constants.METAD_USER,\n\
- \ constants.MOND_USER,\n\
- \ ]\n\
- \groups = [constants.MASTERD_GROUP,\n\
- \ constants.NODED_GROUP,\n\
- \ constants.RAPI_GROUP,\n\
- \ constants.CONFD_GROUP,\n\
- \ constants.WCONFD_GROUP,\n\
- \ constants.KVMD_GROUP,\n\
- \ constants.LUXID_GROUP,\n\
- \ constants.METAD_GROUP,\n\
- \ constants.MOND_GROUP,\n\
- \ constants.DAEMONS_GROUP,\n\
- \ constants.ADMIN_GROUP,\n\
- \ ]\n\
- \encoded = (users, groups)\n\
- \print serializer.Dump(encoded)" ""
- >>= checkPythonResult
- let deserialised = J.decode py_stdout::J.Result ([String], [String])
- (py_users, py_groups) <-
- case deserialised of
- J.Ok ops -> return ops
- J.Error msg ->
- assertFailure ("Unable to decode users/groups: " ++ msg)
- -- this already raised an expection, but we need it for proper
- -- types
- >> fail "Unable to decode users/groups"
- assertEqual "Mismatch in number of returned users"
- (length py_users) (length users)
- assertEqual "Mismatch in number of returned users"
- (length py_groups) (length groups)
- mapM_ (uncurry (assertEqual "Different result for users")
- ) $ zip users py_users
- mapM_ (uncurry (assertEqual "Different result for groups")
- ) $ zip groups py_groups
testSuite "Runtime"
[ 'case_LogFiles
- , 'case_UsersGroups
]
1.1 app-emulation/ganeti/files/ganeti-2.13-daemon-util.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/files/ganeti-2.13-daemon-util.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/files/ganeti-2.13-daemon-util.patch?rev=1.1&content-type=text/plain
Index: ganeti-2.13-daemon-util.patch
===================================================================
diff --git a/daemons/daemon-util.in b/daemons/daemon-util.in
index 7636fc9..e93370f 100644
--- a/daemons/daemon-util.in
+++ b/daemons/daemon-util.in
@@ -31,25 +31,28 @@ set -e
@SHELL_ENV_INIT@
-readonly defaults_file="$SYSCONFDIR/default/ganeti"
-
-# This is a list of all daemons and the order in which they're started. The
-# order is important as there are dependencies between them. On shutdown,
-# they're stopped in reverse order.
-DAEMONS=(
- ganeti-noded
- ganeti-confd
- ganeti-wconfd
- ganeti-rapi
- ganeti-luxid
- ganeti-kvmd
- )
+readonly defaults_file="$SYSCONFDIR/conf.d/ganeti"
# This is the list of daemons that are loaded on demand; they should only be
# stopped, not started.
ON_DEMAND_DAEMONS=(
ganeti-metad
)
+DAEMONS=( ganeti-noded ganeti-confd )
+
+_is_master() {
+ [ -z "${GANETI_MASTER}" ] && GANETI_MASTER="$(gnt-cluster getmaster)"
+ [ -z "${LOCAL_HOSTNAME}" ] && LOCAL_HOSTNAME="$(hostname -f)"
+ [ "${GANETI_MASTER}" = "${LOCAL_HOSTNAME}" ]
+}
+
+if _is_master; then
+ DAEMONS+=( ganeti-wconfd ganeti-rapi ganeti-luxid )
+else
+ DAEMONS+=( ganeti-rapi )
+fi
+
+DAEMONS+=( ganeti-kvmd )
_mond_enabled() {
[[ "@CUSTOM_ENABLE_MOND@" == True ]]
