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).

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xE3F69979BB4B8928DA78E3D17CBF44EF

5 files changed, 47 insertions, 21 deletions

diff --git a/app-emulation/ganeti/ChangeLog b/app-emulation/ganeti/ChangeLog
index 8c90f6fb1205..9aa42e52b6cb 100644
--- a/app-emulation/ganeti/ChangeLog
+++ b/app-emulation/ganeti/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-emulation/ganeti
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.99 2015/03/07 00:13:58 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.100 2015/03/13 18:53:31 chutzpah Exp $
+
+*ganeti-2.12.1-r3 (13 Mar 2015)
+
+  13 Mar 2015; Patrick McLean <chutzpah@gentoo.org>
+  +files/ganeti-2.12-cfgupgrade-state.patch, +ganeti-2.12.1-r3.ebuild,
+  -ganeti-2.12.1-r2.ebuild, files/ganeti-2.12-daemon-util.patch:
+  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).
 
 *ganeti-2.12.1-r2 (07 Mar 2015)
 
diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest
index 0ab739539d22..d05c3e468134 100644
--- a/app-emulation/ganeti/Manifest
+++ b/app-emulation/ganeti/Manifest
@@ -13,7 +13,8 @@ AUX ganeti-2.11-regex-builtin.patch 616 SHA256 a93531f2d3c4257cd0e53b830a93a2e56
 AUX ganeti-2.11-start-stop-daemon-args.patch 1288 SHA256 1fc58d244eacdb52c6f07c0ff5bcd356f6df45c3547da0df360bf8cd52d75428 SHA512 5ce5bbf96a957a35800589a1fe01f549487b059f7a20aabf2e3730df282d692e360730133fba8e0cfc8ec3a2e7c020ca1af4ee02a5d84072726391ed52bedb53 WHIRLPOOL c38d6904167ab590cef4930535a751537747c135ddbbf3533d143563d27360014831b4581ca80d6c5b422555ad40b7f435d2d107d6b5a037b212e2ac71ad144d
 AUX ganeti-2.11-tests.patch 427 SHA256 25f3ea7607fca041003e509dca9c8b037a542a918311d0dec3ef5ad1ab3fe489 SHA512 34d72b16a302ae89c58ca02e01adb90b586a50dde8e847964919f11ef353e8cd17bb737ea4180072cd7800a348f88ad47bc6871831d008559c69975257f1e815 WHIRLPOOL 8e8f0c14a838a5f740fdcabb59c1d50bd281bf2af1084780a601d36dd81efb3ca0074b9f5311d8d8aae327c53da6bd05550075da8fe496bea01c94a3bb8e134f
 AUX ganeti-2.11-useradd.patch 850 SHA256 72fe58a74d5ee1c28f43e491988a3ae6815fb08852ef26bf901b7f64377d8046 SHA512 0304d8b9a844baf4d82ef32e345b702b32faef74fefb632c24fa7c4c072b638ed39e10ce7716afb8a81e6362ac79b2e1b291a795e644cc3b41561f94e932d90f WHIRLPOOL 075368605932ae3b818377463f1a178702701061756065a1ed2434c47e8a02ab8357810893c3affb1bd2ec5e8bd42e3e30d12bbe44743fd36cbd3f6184db10d7
-AUX ganeti-2.12-daemon-util.patch 1071 SHA256 f1e136becef5b40aff97b5dc5b51b79ee6969a93068fa6729ebc0f6a5ca84c5b SHA512 8098ff8f1bc1b694eeaad80e83b0c416871dd333c3c68d1aaabf4372ad5eb52827607e2a678bc3dfe2519aa3166681d067a7fb34eb81e80c40cfd1ff686da027 WHIRLPOOL a2ba49bba70372a0633c9df1ec18175ada25f785c3976a4ab065c27c06251b0723c57f280ffef963bf2b4b8cf652d0d03758b93b94de530f6d3a55bb22e7e7ec
+AUX ganeti-2.12-cfgupgrade-state.patch 566 SHA256 c8e4cce70230b1988cba79ac052f7fed1e183fac8f6b0f31e01be58da290f935 SHA512 867e149ee213b9e6fc4e7ebdc93550dfde012f2c352ae521ad2be1f7acc261c61d6f61c86da094756d08913c78e9b6e18e89738be493cd6f3208f3c9d1228277 WHIRLPOOL af9fec1960d32cd174a4c7898928b96d5e71448923f7804dc000a10797936c71ea2bf71bed939d5726dcaf1bf4df1b09e9dd13a747020f7863a2aa5648f89465
+AUX ganeti-2.12-daemon-util.patch 1056 SHA256 6cc193cafbd1e05a4cca180ee3bf4c84728ffff62eb98e97092e2c56c46c2eaa SHA512 91dcd0438a0f7bc8acb3a60d82819dbc78ebadb916159983f595fc16d93959b7873a50fff01da69caeb900e2b7b7fad80d882eb5584e98e1e6a2f76fb2485a53 WHIRLPOOL e4545cd8196fb0bb087bdb47a5e9925b3635139a60f85a38ec2cc2eff637acd6c5c0e34354eec4489c7cc740e56314db6695d0d1cc387bbfb24e885fbe7f1468
 AUX ganeti-2.12-qemu-enable-kvm.patch 569 SHA256 0dffced71895e89433683f4dbbfec4c0e01dcd053f965a0a4480347adaaca749 SHA512 10aa94b625a9bfb64610fec282444f811e28200b0ea3e284c41def7990b901f4337be7e3cb9f355c6f021637f3ffb799cf8f28090a731410ec17ce0ae3f8200b WHIRLPOOL 4948625da760913ad8afdd0e8871748a48d75caf5a9452b667d99bd826fab72bd24d6936cfd8ed09d0cc005359c78ead02e1ef68a72eda4acff29bd73243a69c
 AUX ganeti-2.12-start-stop-daemon-args.patch 1310 SHA256 6865b90e4b6662d05e6a87b6369ffbfc3e2568796873ebfb6cad36f422ea9671 SHA512 dad3fdbecc1efcb01cd22ba277122f07c7193eb11ad5e45d5e6c82ccace5cf13f1d666241412a484ffbf5581d652329b8fd267ab0fdca4ae79966f3c40cd579e WHIRLPOOL 293f0bac532a5bbcd4daf75ee903ceddf48269c71efe0e2a2fd02c767f79ea35d1fcfb10415ea97fdf556525cc6240202309c17804f1000fa0aa6999151517af
 AUX ganeti-2.12-tests.patch 2576 SHA256 b0307e3532e1fc5e48a24ecc3add5a4d8ac96d3d7764956d25741143c52d9802 SHA512 af7a6883d25576ef1191e0ddce6eb469bf2c46e566e0f8d89e3e1ebe985a51d35b6cc95e4684c0035e30589849c27e39be51a7b8ebf94821ade7e996921021d1 WHIRLPOOL 816e7116ffeafb9adcfdfeac8475436c30b3a941478e1bd7efb3a08536ae4f040b80926b1e709aac97fd1d04f4ba61221fe42c5a82537b0bfbd9e58d519e908d
@@ -39,24 +40,24 @@ DIST ganeti-2.12.1.tar.gz 4353529 SHA256 bd1b33d12485f4de25cca74dcf2e5354067cdda
 DIST ganeti-2.4.5.tar.gz 1828118 SHA256 9141379f3802238fb209309ec12f7090d872b77d7a473c91fe766d1fcec97c89 SHA512 e3abc2fd7c031fbef41c6e993f4cb129fa1dd4cb8c44961a2574da23832fd8412b8b3664b2e05ba8236cb8e58e8d70c3c9081f3f1b6dba8ffdc28d298c8a5099 WHIRLPOOL 897c2b3cdf0c7b03232a4ec99314439dbd29afd65eb2502d21a9f197cc098323a4b9ec0671c24ef7aad44b5327316ee68731e7e5304c8730d03f8ca908b93b62
 EBUILD ganeti-2.10.5-r4.ebuild 4775 SHA256 30f797b09d1510a1a0fa0a91bb400449269042c7cb4bd2beb96decd963451eb3 SHA512 52c5ebf14db43a9c57bd9c57fc0b784493448430e2a0990c72eaec773403a898cfbab67c1cdc3916259a0ff3259e9de6bf3ae0e048196277be8393658e7eebd9 WHIRLPOOL a9879141baacbc19964f9c61bb36e2d16269d8b07d9b1a3d87c2c866deceb3668c9fb8a40b6cc1bb9ab1c0027ee1105eaf2f8df1a8afc4bc7bfcd5cf56f582b1
 EBUILD ganeti-2.11.6-r2.ebuild 6236 SHA256 c72fbaa8ef1ab96b38c4615e32e307b668fc5b0bc21e6e78d3c76f14e93dc7e0 SHA512 167c73f97fbe3ed456a0c61326877ff4960f41b215a2ddcf667eb7c6ee89e59072127a6a851fba2da4d46856c6c46b0fc6ba3500deab8254df16a93026878c22 WHIRLPOOL 2010fbcfb28cea6c5d682efaa4f4121ed185fdf8de050657f61141531ed5e45c8f6f49ab6d45bd1c810a20910fb05b082da66ceb0716d30e522810b771c12872
-EBUILD ganeti-2.12.1-r2.ebuild 7334 SHA256 eed201fe465a463e702a95589e5cd741dbc0b9b05ebba348cea758b83ec750c5 SHA512 0993278e69965430b75f61020b6a62b6bc452248ff6b2311c41e18f01299ba48ae1755f9de98c5d523a76a01f84ebb751a8cada3a0f564b9bba0b514c1aabf32 WHIRLPOOL 59ef7b6c9e090f6d369d9290846a1fdc64ff6f20d6a4ef5f9ca524847d363161a8562c246cd7dcaa03319552509b18dd1ecc8d81e4093a25fc027f2ce88d85bb
+EBUILD ganeti-2.12.1-r3.ebuild 7383 SHA256 47c38b6de11175b711448c916ebc8554041795064891721974c825ff2fe92699 SHA512 83702adaea8bc55f3433273d1a41b1bc638dff4157ef118f1c3e12bb517508d6c5d644c85d6bbbe2a2ebea99a012834b4920c2a4825d75a5a06e5ce58c711bfd WHIRLPOOL 9cbe5376bb22ef479438af93205bd210eaa97294e8160b054ce9271bb6a4a1858f63aba39851da3e78a6dd47b77d120116d80b4f5e6d535896e1592872cab6e4
 EBUILD ganeti-2.4.5-r1.ebuild 2540 SHA256 8024d6ba63f08762ec42f6acf8d3ad7f7f51ca4d221f780e7b86229e694dbea3 SHA512 85cce9aa0ccbfbfb889962b407eda507adaa5cbbf0630ddea6b86dc923c8b23dc4e881a41d0a63cf927f0b93b9427c10f428b36f534658ed8edec272e2559677 WHIRLPOOL 7a65b8e03cdf3ca189ea0cfd2ceeba597d45843df7c8a25f4c7de8224a16421f1235e9e7689c84b566c9eaeab815ef939259915e02b884beb1996595951a35bb
-MISC ChangeLog 22282 SHA256 c286ca33ec577b29d8582f1fce37e972fa498b017c0878c2fea32b6781ae3c9b SHA512 a9aa95584f00394550b9905ba71bf9eb592b83f529924cec72d56dc0b90d07cc2d3d57163da47d2597166e9c1872880ab35828c37ab742652fbefb9e23f68cf2 WHIRLPOOL 5551179052e3a9e16803d232115c70b894f77a05483bfdfdaa670694c24ef0b6ffa7792c63f980ac7670a2eeec4cad8313d45a5077f739113e4fe6183d994f0e
+MISC ChangeLog 22681 SHA256 e1220dc581b9930757ccf362d3f9385caf33d424d341b767dd1c45adc8dcb7a2 SHA512 69d68a934c283f95486d8d3a1042540e5d53730823e135f25cb1cf4dcd6deb3d91257947571b04e5741490ecd266fd473b658875dd0f3648b9dd21ffb8da255c WHIRLPOOL 29a9d24f145aea18f317f97babf6ed865e1a178f171972f4a7dbb41f1b72d498a9850412a031f66c80b4cdef08ea778b4621cf2b9abd61b7665c9686d8055f5c
 MISC metadata.xml 1666 SHA256 b30104372f656db1e16b213d141b9224208958df5231bb17214ad7897a759662 SHA512 85c98e126690eccd836d4d7472327edc588785c27d0da7f71ce562783e9d1685b5a2f681438bcb619831476443792a4ef272cc61d339bbb1e352b8921788ef98 WHIRLPOOL f66c5e39d6be4808d65cd21203255bc0b1a6ae3ccce3d0b84ec0ecd062e6e3dc682807f92f9b30fa3cb32bbaa67f35f1775a9a8974e2b295282c34e3cfa1293b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU+kLQAAoJEHy/RO9cNQiDitwP/RyDw4QyOHE7WCfWHNhacakf
-5a1n3GYiLMVIpFu64Lwjko6B/jR4cOtigvmbZEgXwnzl6RN56nH0oHtmVu4XAnev
-Bmno4xw7fNYMKv6bjW8lZ1ZlsIYguWMJjB/xbi9I0lHlV+rxPymQZ6eOoUdNuQdi
-NeIXi9B/AMZf+DWx/NWvmnBXsLUUPr/CMprWmYRgmUuEiPiX7T8h7OlNQHLNncwx
-pkBG5AXERUEEAPxOo59h4Oy1+FC2O9Nzm/TsUf4YxXc/UrCYaRnCbrGGSqsOAL03
-RPLTTYn8yoI9JpC/KLCGuOTLSJOhThg0lliStMcki62sJPdq/MMe8O9aFVjOsa61
-gQBxH9bMSc57dFYMb/ZMoQdqic31QnpY0AGSF/jsjieUyRbtmyjz5GKP+yXXoFFi
-kL4TLDG1SXp4K5apv1Nx2mvyyGT3lEjek1bTtK9y2G1yNFQF/6/s1noaNSezXr43
-RSOll4snu4D+trm2O5EJFaYFcu7cJJPsoISj5MELP5wy4iLAjXhCOQ1c6R7gmKOG
-q5f25XcEACkx1kurDrpnlDs4Hi1JfXlovXsVtd2T7HSbMP7Y8tneQqsv84F32iXH
-3DAnP1b6wmwvgvCFshZbOI+dNx3wAM20yNvm7ug9MTFso0sB4pEr5xBkwhS/rJU4
-+6qc22y+YxMvW2pspVEe
-=jT9M
+iQIcBAEBCAAGBQJVAzI/AAoJEHy/RO9cNQiD3FIP/0h/bQhej+BA+IZc9iByouK5
+9bIcP/H+awdNmrSA6GuwrzG8rt+Dvbiw4pk+qyRKPWDGd65jtYAIAOgTfT5Kkaup
+zI0lcUj5gnlpXR2tecLGRpBcq69M2l5q/tpqZf5SxRiLiDCvD39h5Kg1Biduy7pR
+N6Ke6F5eSY8tGFKfR0tmT9mWztlCamPGtCAFikdw/6B2rIDHDlFWfOjc2ZykMdL5
+oxhTZfEoZMOm9azgDbx9FiwfG92kYQSqkV37xRqHEF9TypiQouJ0pZaC1wgjGP1A
+PzApl8pdPahfGV1h9K+iewBq9nIGSS968meJSoWYsX4wapEjTpJKR13eyL45XqYg
+HKTW2kkgxRiklywWTPaj6WyE/tJrvI1s6HFk7bheolSp32QyN57BKMsw+wgGEfTo
+09z5vHDyDT2CB0gAuGux1W+mJE8E3cqj5JEYAS9m+SvqpMsSzM+sCL7R2HbQft9e
+Rhx81t/+G1fck3rNhC2/7yhTsY7C4Xc6gUM/YPdXCPdvKOSVPHxEkt7WLG/xD22Q
+xoKsw8/kFkwgI4e3m8wWi489xJPh2VeUajTNQgsik1SdgD2g3zvaRydYHKrWyFNN
+w9AsgyWlPo822haXWGoEsyN6ABrJOKr6vMrve+jsPfRoB/iCmtp/zOoYH/IRb2lJ
+3lt+yDZzbijCu1bYg1B0
+=0iKT
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/ganeti/files/ganeti-2.12-cfgupgrade-state.patch b/app-emulation/ganeti/files/ganeti-2.12-cfgupgrade-state.patch
new file mode 100644
index 000000000000..42841f905937
--- /dev/null
+++ b/app-emulation/ganeti/files/ganeti-2.12-cfgupgrade-state.patch
@@ -0,0 +1,15 @@
+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
+ 
diff --git a/app-emulation/ganeti/files/ganeti-2.12-daemon-util.patch b/app-emulation/ganeti/files/ganeti-2.12-daemon-util.patch
index 1b533b1bb0cd..79bda3c989f3 100644
--- a/app-emulation/ganeti/files/ganeti-2.12-daemon-util.patch
+++ b/app-emulation/ganeti/files/ganeti-2.12-daemon-util.patch
@@ -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 @@ index 6a47253..7eec363 100644
 -  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 @@ index 6a47253..7eec363 100644
 +}
 +
 +if _is_master; then
-+  DAEMONS+=( ganeti-masterd ganeti-rapi ganeti-luxid )
++  DAEMONS+=( ganeti-wconfd ganeti-rapi ganeti-luxid )
 +fi
 +
 +DAEMONS+=( ganeti-kvmd )
diff --git a/app-emulation/ganeti/ganeti-2.12.1-r2.ebuild b/app-emulation/ganeti/ganeti-2.12.1-r3.ebuild
index e4317ecd2729..8e4156f4c75f 100644
--- a/app-emulation/ganeti/ganeti-2.12.1-r2.ebuild
+++ b/app-emulation/ganeti/ganeti-2.12.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.12.1-r2.ebuild,v 1.1 2015/03/07 00:13:58 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.12.1-r3.ebuild,v 1.1 2015/03/13 18:53:31 chutzpah Exp $
 
 EAPI=5
 PYTHON_COMPAT=(python2_7)
@@ -135,6 +135,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.11-dont-print-man-help.patch"
 	"${FILESDIR}/${PN}-2.11-daemon-util-tests.patch"
 	"${FILESDIR}/${PN}-2.12-tests.patch"
+	"${FILESDIR}/${PN}-2.12-cfgupgrade-state.patch"
 )
 
 REQUIRED_USE="kvm? ( || ( amd64 x86 ) )"