* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/files/
@ 2016-07-12 0:53 Robin H. Johnson
0 siblings, 0 replies; 5+ messages in thread
From: Robin H. Johnson @ 2016-07-12 0:53 UTC (permalink / raw
To: gentoo-commits
commit: cf0146e62e96e3be5914437c766e97418f9ff855
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 12 00:53:25 2016 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Jul 12 00:53:42 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf0146e6
app-emulation/ganeti: fix bashisms.
Package-Manager: portage-2.2.28
app-emulation/ganeti/files/ganeti-kvm-poweroff.initd | 4 ++--
app-emulation/ganeti/files/ganeti.initd-r3 | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app-emulation/ganeti/files/ganeti-kvm-poweroff.initd b/app-emulation/ganeti/files/ganeti-kvm-poweroff.initd
index 487e9e5..af25b24 100644
--- a/app-emulation/ganeti/files/ganeti-kvm-poweroff.initd
+++ b/app-emulation/ganeti/files/ganeti-kvm-poweroff.initd
@@ -35,7 +35,7 @@ stop() {
break
fi
- echo -n "."
+ printf "."
for vm_monitor in $(find $CONTROL_PATH -type s -name '*.monitor') ; do
if ! echo | socat -U UNIX:$vm_monitor STDIO > /dev/null 2>&1; then
rm -rf $vm_monitor
@@ -43,7 +43,7 @@ stop() {
done
sleep 5
- let remaining-=5 1
+ remaining=$((remaining - 5))
done
if [ -n "$(find $CONTROL_PATH -type s -name '*.monitor')" ] ; then
diff --git a/app-emulation/ganeti/files/ganeti.initd-r3 b/app-emulation/ganeti/files/ganeti.initd-r3
index 501563c..a238aa1 100644
--- a/app-emulation/ganeti/files/ganeti.initd-r3
+++ b/app-emulation/ganeti/files/ganeti.initd-r3
@@ -29,13 +29,13 @@ start() {
local daemon retval=0 optsvar started_daemons daemon_opts
for daemon in $(${DAEMON_UTIL} list-start-daemons); do
- optsvar="${daemon//-/_}"
+ optsvar="$(printf "${daemon}_OPTS" | tr - _ | LC_ALL=C tr '[:lower:]' '[:upper:]')"
case "${daemon#ganeti-}" in
masterd|rapi|luxid) is_master || continue;;
esac
- eval daemon_opts=\"\$\{${optsvar^^*}_OPTS\}\"
+ eval daemon_opts=\"\$\{${optsvar}\}\"
ebegin "Starting ${daemon}"
eindent
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/files/
@ 2016-07-13 21:37 Robin H. Johnson
0 siblings, 0 replies; 5+ messages in thread
From: Robin H. Johnson @ 2016-07-13 21:37 UTC (permalink / raw
To: gentoo-commits
commit: 2671b355b97553fbd6696dc82469630fdfcf58c9
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 13 21:36:43 2016 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 21:37:40 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2671b355
app-emulation/ganeti: make it easier to restart a downed cluster
Package-Manager: portage-2.2.28
app-emulation/ganeti/files/ganeti.initd-r3 | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/app-emulation/ganeti/files/ganeti.initd-r3 b/app-emulation/ganeti/files/ganeti.initd-r3
index a238aa1..e255354 100644
--- a/app-emulation/ganeti/files/ganeti.initd-r3
+++ b/app-emulation/ganeti/files/ganeti.initd-r3
@@ -3,6 +3,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
+extra_commands="forcestart is_master"
+
depend() {
need localmount logger
after bootmisc sshd
@@ -17,6 +19,17 @@ is_master() {
[ "${ganeti_master}" = "${local_hostname}" ]
}
+# This exists specifically for restarting a 2-node cluster where quorum might
+# not be available.
+forcestart() {
+ ewarn "Forcing non-quorum Ganeti master start"
+ GANETI_WCONFD_OPTS="${GANETI_WCONFD_OPTS} --no-voting --yes-do-it"
+ GANETI_LUXID_OPTS="${GANETI_LUXID_OPTS} --no-voting --yes-do-it"
+ GANETI_MASTERD_OPTS="${GANETI_LUXID_OPTS} --no-voting --yes-do-it"
+ export GANETI_WCONFD_OPTS GANETI_LUXID_OPTS GANETI_MASTERD_OPTS
+ start
+}
+
start() {
if ! [ -e ${DAEMON_UTIL} ]; then
eerror "Could not find daemon utility at ${DAEMON_UTIL}"
@@ -39,6 +52,7 @@ start() {
ebegin "Starting ${daemon}"
eindent
+ veinfo ${DAEMON_UTIL} start ${daemon} ${GANETI_OPTS} ${daemon_opts}
${DAEMON_UTIL} start ${daemon} ${GANETI_OPTS} ${daemon_opts} || retval=${?}
if [ ${retval} != 0 ] && [ -n "${started_daemons}" ]; then
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/files/
@ 2017-01-07 0:37 Robin H. Johnson
0 siblings, 0 replies; 5+ messages in thread
From: Robin H. Johnson @ 2017-01-07 0:37 UTC (permalink / raw
To: gentoo-commits
commit: de6a4b551f385b86b80187415a9716fbe2903a2c
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 6 20:43:12 2017 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Jan 7 00:37:35 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de6a4b55
app-emulation/ganeti: cleanup unused patches.
Package-Manager: portage-2.3.2
.../ganeti/files/ganeti-2.11-daemon-util.patch | 38 ------------
.../ganeti/files/ganeti-2.11-qemu-enable-kvm.patch | 12 ----
.../ganeti/files/ganeti-2.11-regex-builtin.patch | 15 -----
.../files/ganeti-2.11-start-stop-daemon-args.patch | 39 -------------
.../ganeti/files/ganeti-2.11-useradd.patch | 17 ------
app-emulation/ganeti/files/ganeti-2.12-tests.patch | 59 -------------------
.../ganeti/files/ganeti-2.12.3-daemon-util.patch | 37 ------------
.../ganeti/files/ganeti-2.13-daemon-util.patch | 46 ---------------
.../ganeti-2.13-disable-usersgroups-test.patch | 68 ----------------------
.../files/ganeti-2.13-regex-pcre-builtin.patch | 13 -----
.../ganeti/files/ganeti-2.7-fix-tests.patch | 30 ----------
11 files changed, 374 deletions(-)
diff --git a/app-emulation/ganeti/files/ganeti-2.11-daemon-util.patch b/app-emulation/ganeti/files/ganeti-2.11-daemon-util.patch
deleted file mode 100644
index 09b10cd..00000000
--- a/app-emulation/ganeti/files/ganeti-2.11-daemon-util.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/daemons/daemon-util.in b/daemons/daemon-util.in
-index 01f2cbb..de4e396 100644
---- a/daemons/daemon-util.in
-+++ b/daemons/daemon-util.in
-@@ -22,18 +22,25 @@ set -e
-
- @SHELL_ENV_INIT@
-
--readonly defaults_file="$SYSCONFDIR/default/ganeti"
-+readonly defaults_file="$SYSCONFDIR/conf.d/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-masterd
-- ganeti-rapi
-- ganeti-luxid
-- ganeti-kvmd
-- )
-+
-+DAEMONS=( ganeti-noded )
-+
-+_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-masterd ganeti-rapi ganeti-luxid )
-+fi
-+
-+DAEMONS+=( ganeti-kvmd )
-
- _confd_enabled() {
- [[ "@CUSTOM_ENABLE_CONFD@" == True ]]
diff --git a/app-emulation/ganeti/files/ganeti-2.11-qemu-enable-kvm.patch b/app-emulation/ganeti/files/ganeti-2.11-qemu-enable-kvm.patch
deleted file mode 100644
index f2cce0c..00000000
--- a/app-emulation/ganeti/files/ganeti-2.11-qemu-enable-kvm.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/lib/hypervisor/hv_kvm.py b/lib/hypervisor/hv_kvm.py
-index b61be65..100aafd 100644
---- a/lib/hypervisor/hv_kvm.py
-+++ b/lib/hypervisor/hv_kvm.py
-@@ -1380,6 +1380,7 @@ class KVMHypervisor(hv_base.BaseHypervisor):
- kvm = hvp[constants.HV_KVM_PATH]
- kvm_cmd = [kvm]
- # used just by the vnc server, if enabled
-+ kvm_cmd.extend(["-enable-kvm"])
- kvm_cmd.extend(["-name", instance.name])
- kvm_cmd.extend(["-m", instance.beparams[constants.BE_MAXMEM]])
-
diff --git a/app-emulation/ganeti/files/ganeti-2.11-regex-builtin.patch b/app-emulation/ganeti/files/ganeti-2.11-regex-builtin.patch
deleted file mode 100644
index 08ef377..00000000
--- a/app-emulation/ganeti/files/ganeti-2.11-regex-builtin.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index d70db62..f94043f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -612,8 +612,8 @@ CONFD_PKG=
- # if a new confd dependency is needed, add it here like:
- # AC_GHC_PKG_CHECK([somepkg], [], [HS_NODEV=1; CONFD_PKG="$CONFD_PKG somepkg"])
- HS_REGEX_PCRE=-DNO_REGEX_PCRE
--AC_GHC_PKG_CHECK([regex-pcre], [HS_REGEX_PCRE=],
-- [HS_NODEV=1; CONFD_PKG="$CONFD_PKG regex-pcre"])
-+AC_GHC_PKG_CHECK([regex-pcre-builtin], [HS_REGEX_PCRE=],
-+ [HS_NODEV=1; CONFD_PKG="$CONFD_PKG regex-pcre-builtin"])
-
- has_confd=False
- if test "$enable_confd" != no; then
diff --git a/app-emulation/ganeti/files/ganeti-2.11-start-stop-daemon-args.patch b/app-emulation/ganeti/files/ganeti-2.11-start-stop-daemon-args.patch
deleted file mode 100644
index 6f90233..00000000
--- a/app-emulation/ganeti/files/ganeti-2.11-start-stop-daemon-args.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/daemons/daemon-util.in b/daemons/daemon-util.in
-index 4d1d7c5..3deeab7 100644
---- a/daemons/daemon-util.in
-+++ b/daemons/daemon-util.in
-@@ -246,10 +246,11 @@ start() {
- @PKGLIBDIR@/ensure-dirs
-
- if type -p start-stop-daemon >/dev/null; then
-- start-stop-daemon --start --quiet --oknodo \
-+ start-stop-daemon --start --quiet \
- --pidfile $pidfile \
-- --startas $daemonexec \
-- --chuid $usergroup \
-+ --exec $daemonexec \
-+ --user $usergroup \
-+ --wait 300 \
- -- $args "$@"
- else
- # TODO: Find a way to start daemon with a group, until then the group must
-@@ -273,7 +274,7 @@ stop() {
- local pidfile=$(_daemon_pidfile $name)
-
- if type -p start-stop-daemon >/dev/null; then
-- start-stop-daemon --stop --quiet --oknodo --retry 30 \
-+ start-stop-daemon --stop --quiet --retry 30 \
- --pidfile $pidfile
- else
- _ignore_error killproc -p $pidfile $name
-@@ -348,8 +348,8 @@ rotate_logs() {
- local daemonexec=$(_daemon_executable $name)
-
- if type -p start-stop-daemon >/dev/null; then
-- start-stop-daemon --stop --signal HUP --quiet \
-- --oknodo --pidfile $pidfile
-+ start-stop-daemon --signal HUP --quiet \
-+ --pidfile $pidfile
- else
- _ignore_error killproc \
- -p $pidfile \
diff --git a/app-emulation/ganeti/files/ganeti-2.11-useradd.patch b/app-emulation/ganeti/files/ganeti-2.11-useradd.patch
deleted file mode 100644
index d546921..00000000
--- a/app-emulation/ganeti/files/ganeti-2.11-useradd.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 7666d18..a8b6396 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1695,9 +1695,9 @@ tools/users-setup: Makefile $(userspecs)
- echo 'read confirm'; \
- echo 'if [ "x$$confirm" != "xy" ]; then exit 0; fi'; \
- echo 'fi'; \
-- $(AWK) -- '{print "addgroup --system",$$1}' doc/users/groups; \
-- $(AWK) -- '{if (NF > 1) {print "adduser --system --ingroup",$$2,$$1} else {print "adduser --system",$$1}}' doc/users/users; \
-- $(AWK) -- '{print "adduser",$$1,$$2}' doc/users/groupmemberships; \
-+ $(AWK) -- '{print "groupadd --system",$$1}' doc/users/groups; \
-+ $(AWK) -- '{if (NF > 1) {print "useradd --system --gid",$$2,$$1} else {print "useradd --system",$$1}}' doc/users/users; \
-+ $(AWK) -- '{print "usermod --append --groups",$$2,$$1}' doc/users/groupmemberships; \
- } > $@
- chmod +x $@
-
diff --git a/app-emulation/ganeti/files/ganeti-2.12-tests.patch b/app-emulation/ganeti/files/ganeti-2.12-tests.patch
deleted file mode 100644
index dcf9b51..00000000
--- a/app-emulation/ganeti/files/ganeti-2.12-tests.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff --git a/test/hs/Test/Ganeti/Runtime.hs b/test/hs/Test/Ganeti/Runtime.hs
-index b15aa36..a805869 100644
---- a/test/hs/Test/Ganeti/Runtime.hs
-+++ b/test/hs/Test/Ganeti/Runtime.hs
-@@ -126,10 +126,6 @@ case_UsersGroups = do
- (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
-diff --git a/test/py/daemon-util_unittest.bash b/test/py/daemon-util_unittest.bash
-index edaeac5..1ee6eae 100755
---- a/test/py/daemon-util_unittest.bash
-+++ b/test/py/daemon-util_unittest.bash
-@@ -45,8 +45,8 @@ if ! grep -q '^ENABLE_MOND = ' lib/_constants.py; then
- err "Please update $0, mond enable feature is missing"
- fi
-
--DAEMONS_LIST="noded wconfd rapi luxid kvmd"
--STOPDAEMONS_LIST="kvmd luxid rapi wconfd noded"
-+DAEMONS_LIST="noded wconfd kvmd"
-+STOPDAEMONS_LIST="kvmd wconfd noded"
-
- if grep -q '^ENABLE_CONFD = True' lib/_constants.py; then
- DAEMONS_LIST="$DAEMONS_LIST confd"
-diff --git a/test/py/ganeti.utils.process_unittest.py b/test/py/ganeti.utils.process_unittest.py
-index 7d4cbb6..08752fe 100755
---- a/test/py/ganeti.utils.process_unittest.py
-+++ b/test/py/ganeti.utils.process_unittest.py
-@@ -274,7 +274,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" %
-@@ -289,15 +289,6 @@ class TestRunCmd(testutils.GanetiTestCase):
- self.assert_(status < 0)
- self.assertEqual(-status, signal.SIGKILL)
-
-- def testTimeoutOutputAfterTerm(self):
-- cmd = ("trap 'echo sigtermed; exit 1' TERM; echo >&%d; read < %s" %
-- (self.proc_ready_helper.write_fd, self.fifo_file))
-- 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.assert_(result.failed)
-- self.assertEqual(result.stdout, "sigtermed\n")
--
- def testListRun(self):
- """Test list runs"""
- result = utils.RunCmd(["true"])
diff --git a/app-emulation/ganeti/files/ganeti-2.12.3-daemon-util.patch b/app-emulation/ganeti/files/ganeti-2.12.3-daemon-util.patch
deleted file mode 100644
index 2f6bfa3..00000000
--- a/app-emulation/ganeti/files/ganeti-2.12.3-daemon-util.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/daemons/daemon-util.in b/daemons/daemon-util.in
-index 6a47253..d7afd84 100644
---- a/daemons/daemon-util.in
-+++ b/daemons/daemon-util.in
-@@ -31,18 +31,24 @@ set -e
-
- @SHELL_ENV_INIT@
-
--readonly defaults_file="$SYSCONFDIR/default/ganeti"
-+readonly defaults_file="$SYSCONFDIR/conf.d/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-wconfd
-- ganeti-rapi
-- ganeti-luxid
-- ganeti-kvmd
-- )
-+DAEMONS=( ganeti-noded )
-+
-+_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 )
-+fi
-+
-+DAEMONS+=( ganeti-kvmd )
-
- # This is the list of daemons that are loaded on demand; they should only be
- # stopped, not started.
diff --git a/app-emulation/ganeti/files/ganeti-2.13-daemon-util.patch b/app-emulation/ganeti/files/ganeti-2.13-daemon-util.patch
deleted file mode 100644
index 5d8dedf..00000000
--- a/app-emulation/ganeti/files/ganeti-2.13-daemon-util.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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 ]]
diff --git a/app-emulation/ganeti/files/ganeti-2.13-disable-usersgroups-test.patch b/app-emulation/ganeti/files/ganeti-2.13-disable-usersgroups-test.patch
deleted file mode 100644
index 6e81b51..00000000
--- a/app-emulation/ganeti/files/ganeti-2.13-disable-usersgroups-test.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-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
- ]
diff --git a/app-emulation/ganeti/files/ganeti-2.13-regex-pcre-builtin.patch b/app-emulation/ganeti/files/ganeti-2.13-regex-pcre-builtin.patch
deleted file mode 100644
index ced966f..00000000
--- a/app-emulation/ganeti/files/ganeti-2.13-regex-pcre-builtin.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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=
diff --git a/app-emulation/ganeti/files/ganeti-2.7-fix-tests.patch b/app-emulation/ganeti/files/ganeti-2.7-fix-tests.patch
deleted file mode 100644
index b3b5ad1..00000000
--- a/app-emulation/ganeti/files/ganeti-2.7-fix-tests.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/test/py/ganeti.hooks_unittest.py b/test/py/ganeti.hooks_unittest.py
-index 30e00d8..50f91fc 100755
---- a/test/py/ganeti.hooks_unittest.py
-+++ b/test/py/ganeti.hooks_unittest.py
-@@ -192,7 +192,7 @@ class TestHooksRunner(unittest.TestCase):
- os.symlink("/usr/bin/env", fname)
- self.torm.append((fname, False))
- env_snt = {"PHASE": phase}
-- env_exp = "PHASE=%s" % phase
-+ env_exp = "LD_PRELOAD=libsandbox.so\\nPHASE=%s" % phase
- self.failUnlessEqual(self.hr.RunHooks(self.hpath, phase, env_snt),
- [(self._rname(fname), HKR_SUCCESS, env_exp)])
-
-diff --git a/test/py/ganeti.utils.process_unittest.py b/test/py/ganeti.utils.process_unittest.py
-index 2e36cfa..e0392b2 100755
---- a/test/py/ganeti.utils.process_unittest.py
-+++ b/test/py/ganeti.utils.process_unittest.py
-@@ -341,10 +341,10 @@ class TestRunCmd(testutils.GanetiTestCase):
- def testResetEnv(self):
- """Test environment reset functionality"""
- self.failUnlessEqual(utils.RunCmd(["env"], reset_env=True).stdout.strip(),
-- "")
-+ "LD_PRELOAD=libsandbox.so")
- self.failUnlessEqual(utils.RunCmd(["env"], reset_env=True,
- env={"FOO": "bar",}).stdout.strip(),
-- "FOO=bar")
-+ "LD_PRELOAD=libsandbox.so\nFOO=bar")
-
- def testNoFork(self):
- """Test that nofork raise an error"""
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/files/
@ 2017-12-12 17:08 Matthias Maier
0 siblings, 0 replies; 5+ messages in thread
From: Matthias Maier @ 2017-12-12 17:08 UTC (permalink / raw
To: gentoo-commits
commit: 91eb61738b704880c88f8b3e58f234f290a62843
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Nov 19 12:52:12 2017 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Tue Dec 12 17:05:46 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91eb6173
app-emulation/ganeti: remove unused patch
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
...st_agent-QEMU-Guest-Agent-sup.stable-2.17.patch | 122 ---------------------
1 file changed, 122 deletions(-)
diff --git a/app-emulation/ganeti/files/0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.17.patch b/app-emulation/ganeti/files/0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.17.patch
deleted file mode 100644
index f7a664fa776..00000000000
--- a/app-emulation/ganeti/files/0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.17.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From e91ae73f593115dba1f77af6a3af30cf2219f880 Mon Sep 17 00:00:00 2001
-Message-Id: <e91ae73f593115dba1f77af6a3af30cf2219f880.1483650125.git.robbat2@gentoo.org>
-From: "Robin H. Johnson" <robbat2@gentoo.org>
-Date: Thu, 29 Sep 2016 08:57:28 -0700
-Subject: [PATCH-2.17] kvm: use_guest_agent: QEMU Guest Agent support
-
-Implement the QEMU Guest Agent sockets, so that code/scripts on the
-hypervisors can communicate with guest operating systems easily.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
----
- lib/hypervisor/hv_kvm/__init__.py | 23 +++++++++++++++++++++++
- man/gnt-instance.rst | 7 +++++++
- src/Ganeti/Constants.hs | 5 +++++
- 3 files changed, 35 insertions(+)
-
-diff --git a/lib/hypervisor/hv_kvm/__init__.py b/lib/hypervisor/hv_kvm/__init__.py
-index ac02ff56c..b865d6f3a 100644
---- a/lib/hypervisor/hv_kvm/__init__.py
-+++ b/lib/hypervisor/hv_kvm/__init__.py
-@@ -497,6 +497,7 @@ class KVMHypervisor(hv_base.BaseHypervisor):
- constants.HV_MIGRATION_BANDWIDTH: hv_base.REQ_NONNEGATIVE_INT_CHECK,
- constants.HV_MIGRATION_DOWNTIME: hv_base.REQ_NONNEGATIVE_INT_CHECK,
- constants.HV_MIGRATION_MODE: hv_base.MIGRATION_MODE_CHECK,
-+ constants.HV_USE_GUEST_AGENT: hv_base.NO_CHECK,
- constants.HV_USE_LOCALTIME: hv_base.NO_CHECK,
- constants.HV_DISK_CACHE:
- hv_base.ParamInSet(True, constants.HT_VALID_CACHE_TYPES),
-@@ -750,6 +751,13 @@ class KVMHypervisor(hv_base.BaseHypervisor):
- """
- return utils.PathJoin(cls._CTRL_DIR, "%s.qmp" % instance_name)
-
-+ @classmethod
-+ def _InstanceQemuGuestAgentMonitor(cls, instance_name):
-+ """Returns the instance serial QEMU Guest Agent socket name
-+
-+ """
-+ return utils.PathJoin(cls._CTRL_DIR, "%s.qga" % instance_name)
-+
- @classmethod
- def _InstanceKvmdMonitor(cls, instance_name):
- """Returns the instance kvm daemon socket name
-@@ -836,6 +844,7 @@ class KVMHypervisor(hv_base.BaseHypervisor):
- utils.RemoveFile(cls._InstanceMonitor(instance_name))
- utils.RemoveFile(cls._InstanceSerial(instance_name))
- utils.RemoveFile(cls._InstanceQmpMonitor(instance_name))
-+ utils.RemoveFile(cls._InstanceQemuGuestAgentMonitor(instance_name))
- utils.RemoveFile(cls._InstanceKVMRuntime(instance_name))
- utils.RemoveFile(cls._InstanceKeymapFile(instance_name))
- uid_file = cls._InstanceUidFile(instance_name)
-@@ -1544,6 +1553,20 @@ class KVMHypervisor(hv_base.BaseHypervisor):
- if self._UUID_RE.search(kvmhelp):
- kvm_cmd.extend(["-uuid", instance.uuid])
-
-+ # Add guest agent socket
-+ if hvp[constants.HV_USE_GUEST_AGENT]:
-+ qga_addr = utils.GetFreeSlot(bus_slots[_PCI_BUS], reserve=True)
-+ qga_pci_info = "bus=%s,addr=%s" % (_PCI_BUS, hex(qga_addr))
-+ qga_path = self._InstanceQemuGuestAgentMonitor(instance.name)
-+ logging.info("KVM: Guest Agent available at %s", qga_path)
-+ # The 'qga0' identified can change, but the 'org.qemu.guest_agent.0' string is
-+ # the default expected by the Guest Agent.
-+ kvm_cmd.extend([
-+ "-chardev", "socket,path=%s,server,nowait,id=qga0" % qga_path,
-+ "-device", "virtio-serial,id=qga0,%s" % qga_pci_info,
-+ "-device", "virtserialport,chardev=qga0,name=org.qemu.guest_agent.0",
-+ ])
-+
- if hvp[constants.HV_KVM_EXTRA]:
- kvm_cmd.extend(hvp[constants.HV_KVM_EXTRA].split(" "))
-
-diff --git a/man/gnt-instance.rst b/man/gnt-instance.rst
-index 283392cc8..493ae929d 100644
---- a/man/gnt-instance.rst
-+++ b/man/gnt-instance.rst
-@@ -545,6 +545,13 @@ viridian
- viridian (Hyper-V) for this instance. The default is false,
- disabling viridian support.
-
-+use\_guest\_agent
-+ Valid for the KVM hypervisor.
-+
-+ A boolean option that specifies if the hypervisor should enable
-+ the QEMU Guest Agent protocol for this instance. By default, the
-+ Guest Agent is disabled.
-+
- use\_localtime
- Valid for the Xen HVM and KVM hypervisors.
-
-diff --git a/src/Ganeti/Constants.hs b/src/Ganeti/Constants.hs
-index 13bff2e71..7f43f89f9 100644
---- a/src/Ganeti/Constants.hs
-+++ b/src/Ganeti/Constants.hs
-@@ -1821,6 +1821,9 @@ hvUsbMouse = "usb_mouse"
- hvUseBootloader :: String
- hvUseBootloader = "use_bootloader"
-
-+hvUseGuestAgent :: String
-+hvUseGuestAgent = "use_guest_agent"
-+
- hvUseLocaltime :: String
- hvUseLocaltime = "use_localtime"
-
-@@ -1955,6 +1958,7 @@ hvsParameterTypes = Map.fromList
- , (hvUsbDevices, VTypeString)
- , (hvUsbMouse, VTypeString)
- , (hvUseBootloader, VTypeBool)
-+ , (hvUseGuestAgent, VTypeBool)
- , (hvUseLocaltime, VTypeBool)
- , (hvVga, VTypeString)
- , (hvVhostNet, VTypeBool)
-@@ -4111,6 +4115,7 @@ hvcDefaults =
- , (hvMigrationBandwidth, PyValueEx (32 :: Int))
- , (hvMigrationDowntime, PyValueEx (30 :: Int))
- , (hvMigrationMode, PyValueEx htMigrationLive)
-+ , (hvUseGuestAgent, PyValueEx False)
- , (hvUseLocaltime, PyValueEx False)
- , (hvDiskCache, PyValueEx htCacheDefault)
- , (hvSecurityModel, PyValueEx htSmNone)
---
-2.11.0.rc2
-
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/files/
@ 2019-02-08 1:30 Patrick McLean
0 siblings, 0 replies; 5+ messages in thread
From: Patrick McLean @ 2019-02-08 1:30 UTC (permalink / raw
To: gentoo-commits
commit: b0903af80ceecc320a1af8d79b394f9dd66378f9
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Fri Feb 8 01:29:35 2019 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Fri Feb 8 01:29:35 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0903af8
app-emulation/ganeti: Revert leftover debug change in -r3 init
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
app-emulation/ganeti/files/ganeti.initd-r3 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-emulation/ganeti/files/ganeti.initd-r3 b/app-emulation/ganeti/files/ganeti.initd-r3
index 7257e992257..18b3116a517 100644
--- a/app-emulation/ganeti/files/ganeti.initd-r3
+++ b/app-emulation/ganeti/files/ganeti.initd-r3
@@ -10,7 +10,7 @@ depend() {
use net
}
-DAEMON_UTIL="/usr/lib64/ganeti/daemon-util"
+DAEMON_UTIL="/usr/lib/ganeti/daemon-util"
is_master() {
[ -z "${ganeti_master}" ] && ganeti_master="$(gnt-cluster getmaster)"
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-02-08 1:30 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-12 0:53 [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/files/ Robin H. Johnson
-- strict thread matches above, loose matches on Subject: below --
2016-07-13 21:37 Robin H. Johnson
2017-01-07 0:37 Robin H. Johnson
2017-12-12 17:08 Matthias Maier
2019-02-08 1:30 Patrick McLean
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox