chutzpah 15/03/13 18:53:31 Modified: ganeti-2.12-daemon-util.patch Added: ganeti-2.12-cfgupgrade-state.patch Log: Revision bump, remove gnt-masterd from daemon-util patch, add code to cfgupgrade to handle 'disk_state_static' and 'hv_state_static' in the cluster config (bug #542628). (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xE3F69979BB4B8928DA78E3D17CBF44EF)
Revision Changes Path 1.2 app-emulation/ganeti/files/ganeti-2.12-daemon-util.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/files/ganeti-2.12-daemon-util.patch?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/files/ganeti-2.12-daemon-util.patch?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/files/ganeti-2.12-daemon-util.patch?r1=1.1&r2=1.2 Index: ganeti-2.12-daemon-util.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/ganeti/files/ganeti-2.12-daemon-util.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ganeti-2.12-daemon-util.patch 6 Mar 2015 01:25:05 -0000 1.1 +++ ganeti-2.12-daemon-util.patch 13 Mar 2015 18:53:31 -0000 1.2 @@ -1,5 +1,5 @@ diff --git a/daemons/daemon-util.in b/daemons/daemon-util.in -index 6a47253..7eec363 100644 +index 6a47253..5d7c4cf 100644 --- a/daemons/daemon-util.in +++ b/daemons/daemon-util.in @@ -31,18 +31,24 @@ set -e @@ -19,7 +19,7 @@ - ganeti-luxid - ganeti-kvmd - ) -+DAEMONS=( ganeti-noded ganeti-wconfd ) ++DAEMONS=( ganeti-noded ) + +_is_master() { + [ -z "${ganeti_master}" ] && ganeti_master="$(gnt-cluster getmaster)" @@ -28,7 +28,7 @@ +} + +if _is_master; then -+ DAEMONS+=( ganeti-masterd ganeti-rapi ganeti-luxid ) ++ DAEMONS+=( ganeti-wconfd ganeti-rapi ganeti-luxid ) +fi + +DAEMONS+=( ganeti-kvmd ) 1.1 app-emulation/ganeti/files/ganeti-2.12-cfgupgrade-state.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/files/ganeti-2.12-cfgupgrade-state.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/files/ganeti-2.12-cfgupgrade-state.patch?rev=1.1&content-type=text/plain Index: ganeti-2.12-cfgupgrade-state.patch =================================================================== diff --git a/tools/cfgupgrade b/tools/cfgupgrade index c8dfdec..0f886b2 100755 --- a/tools/cfgupgrade +++ b/tools/cfgupgrade @@ -169,6 +169,10 @@ def UpgradeCluster(config_data): cluster.get("zeroing_image", "") cluster["compression_tools"] = \ cluster.get("compression_tools", constants.IEC_DEFAULT_TOOLS) + cluster["hv_state_static"] = \ + cluster.get("hv_state_static", {}) + cluster["disk_state_static"] = \ + cluster.get("disk_state_static", {}) if "enabled_user_shutdown" not in cluster: cluster["enabled_user_shutdown"] = False
