adding post install note on the conf.d files, also updated the conf.d files

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

6 files changed, 55 insertions, 10 deletions

diff --git a/sys-cluster/neutron/ChangeLog b/sys-cluster/neutron/ChangeLog
index 99a03b85f351..6355b61be43b 100644
--- a/sys-cluster/neutron/ChangeLog
+++ b/sys-cluster/neutron/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/neutron
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/ChangeLog,v 1.58 2015/05/01 17:27:21 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/ChangeLog,v 1.59 2015/05/06 15:24:16 prometheanfire Exp $
+
+  06 May 2015; Matthew Thode <prometheanfire@gentoo.org>
+  files/neutron-linuxbridge-agent.confd, files/neutron-openvswitch-agent.confd,
+  neutron-2015.1.0.ebuild, neutron-2015.1.9999.ebuild:
+  adding post install note on the conf.d files, also updated the conf.d files
 
   01 May 2015; Matthew Thode <prometheanfire@gentoo.org>
   neutron-2015.1.0.ebuild, neutron-2015.1.9999.ebuild:
diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
index 52371e5118fe..523b92747f36 100644
--- a/sys-cluster/neutron/Manifest
+++ b/sys-cluster/neutron/Manifest
@@ -1,11 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 0001-Fixes-bug-in-interface-handling-of-ip_lib.py.patch 3346 SHA256 f9c382ff3a90653c0356c84847b53b677719ecb37ceb3ee60fd61e72a3c64dbe SHA512 5d99f94b003042d9ee676cad00d051335db72e351842a8ce876740cec556282ac1936ebf3c7355ca785907e745eb0de03bc00fa4b727106afd43632cc54bce0e WHIRLPOOL 28f086275d41d36699286a0e5f8295801cdae8acd37ac3b24c06137cc061f88b5c6cf5d166f1ddafd8b96d7eff51aea4a52fa819d582eb5d854edb5583c4e77a
 AUX 0002-moving-vxlan-module-check-to-sanity-checks-and-makin.patch 9421 SHA256 554ba93fedfd892191ee980f90832aef45d02f639422b6c08bed21e8eb6fdbe1 SHA512 57db212fa09d86e224568822d5f162143b3ac5cd5f27be199fd1c2f89fa25e856e24b09a90c566457ad14beabdc934b3282a3d20dc330377ea6464d45b056ab7 WHIRLPOOL 2a2daf0cbfb298fdf64e328883ef42110c9541de7087b087778fc3ca37c5090da1a25eb73b8fca24bfd78e2166704c5cc0442f92b58756e3b28008be0512a53f
 AUX 0003-fixes-error-logging-to-use-the-right-exception-paren.patch 954 SHA256 b7db04721a0a0322575623678cd33d3852f16fa3770af4aa12b8cecf7101291d SHA512 ea7e96bb22ac2636da7dbc5b5ead7954fa6d87a2e49998e66e1e0e126d30e3091dbecc8c6ac49b27e9da8edb3b4ca3556923911628f7affd53b9096f44f4da2d WHIRLPOOL 11c3b0a65620d31d652abc2736db2fa22181846191f1a7bf7ae8ed8db3553cb70177965c7689447e73bc0f1ede0724fae8e45eb204ee3d5f6ae9f141099ddaa8
 AUX neutron-dhcp-agent.confd 75 SHA256 e36fe3d370ad2b4c82ccf1f4caac60882334d93e3abd7e0e6e268d23cb069d71 SHA512 94cf300c9a9d0275e4fcab4ffdb7e29ca26b73c120d6ff683b48ea0e9c21e46123289522aedd295e4d5d28307133b50084541a90a48db456802d675eed6c2d3e WHIRLPOOL 9e77fe1ef65fa8ef46f8272ddea7213a46e71c6f2884eab20f09eaddc977f5cc202c8529c1a75347132c667e4e2d39d5bdd3ab2c94812c4b1f95f398af75c38c
 AUX neutron-l3-agent.confd 73 SHA256 560997f3e40d90ef885483e4bd02728bf88720378238fc5e6b3b2abb2ba9dd0e SHA512 4a902c5621abc124424bdad97de8959f63f7c846b4c7b9b3ccaab5522ff3e6938acf748df269980484228d4fc13d2f1e3e3670619207e3c88ea5dd5373699e0a WHIRLPOOL 653156dbbff34606fa0694bab622eb40c2ead171b1ad0a0c934285a50f15db4d8927e40ebff8d2ffe64078a8a079d48a2834e68b049c11a68417dc3945374cb8
-AUX neutron-linuxbridge-agent.confd 100 SHA256 d829f07e9062065ba1079a32f9de99b980e8ef818767ddf890c009b6b89a89e0 SHA512 3c999af9b63284218c630b3c73a047f4bb5ef36bd9eb8a2a10c08fe23e3836f276d13ad40b19f6698d49ec2ee6587e62ded9079851b2af5618456082badc1921 WHIRLPOOL dd354818597ea5e93a2cc9bb6a1e750450c4a1b6f513729d64b59c35c3074627a1ad543c5f8b20cc68afe928496633719dd503ca7b58416ca348ab1c96c27933
+AUX neutron-linuxbridge-agent.confd 140 SHA256 1eff0c9c6adb37abf3064a8d035a9d8042bc1151106ed790397d1cca1463c718 SHA512 f49db80c48488b86eb55077fae61202bbe29eaef0f2fa212c44c9b42f41c5f3cc31bdd48c9c405c0e0c51e7d7c3910169a6cc08e36a2be98f9d032b3a11a0a5a WHIRLPOOL 9b9f8932e7a72cdfd241d86b0063d660499c52de62ca6cda09ed6a74649587ef674fca72a0b80f82141e8d0db6fe3c3cf6c28739775230ae7bdf83afcd1fa694
 AUX neutron-metadata-agent.confd 79 SHA256 6888df2f0bf5332d880ceb5a1076816ee605d30b70879d9972b0c9504399edea SHA512 a7a4af56141f1528f7f9ca222f88d400f7a5f6cba392a603121974f6429ecdb925996b1bd6631b589df70464f910deed688e287668ccb1d61fe1d6aa641272a1 WHIRLPOOL e7fc657e6fd0dcf99dad0bc5b7747b1521e22ba1eced8ad163151a0e1ec8c6c9b4eb46ed17ce23264c8903c5aeb2455f9c057ad956fa925d6ad131345cb2d772
-AUX neutron-openvswitch-agent.confd 102 SHA256 a5d5aa7ba2794f593e65c8c87888f29867a817dc169cbae21f06fd6424b5fa87 SHA512 9fb7fc95b1eb00e685e269213bb694019471f9c14074ccac5f55c3969d5ff4d6f98ab3f2ff7e56bd0837a0261ab59b58645e2e7f4caf9ff4ecb52877df816423 WHIRLPOOL aff1c3a5e2b858b598f88699720069031c33305870d2324bc5d059dfc380beae27f5a60278bc5560178596e6a2d22af957205ed75a2df145316d8999cf4b034c
+AUX neutron-openvswitch-agent.confd 142 SHA256 5b58c86356f0f851d5a838bddffe9d86da4ac8a54198859067684ccf37d13715 SHA512 277bc5fe0a55bfc5e6f95ddabee76340a7725d156ca1100bc0dbc6245929322e537129628b5cef353cfe689d14330a7c8e0cd9aff894f7d0b093d909c83fdd87 WHIRLPOOL 5079aaaf0cf32337acb8c74d7de99520f2bd738a9af61844fb276688e1af1b1bc039b9988384914bd8df7aadb03fff7b5f13e57f542f23e489f7660f1afc8519
 AUX neutron-ovs-cleanup.confd 102 SHA256 a5d5aa7ba2794f593e65c8c87888f29867a817dc169cbae21f06fd6424b5fa87 SHA512 9fb7fc95b1eb00e685e269213bb694019471f9c14074ccac5f55c3969d5ff4d6f98ab3f2ff7e56bd0837a0261ab59b58645e2e7f4caf9ff4ecb52877df816423 WHIRLPOOL aff1c3a5e2b858b598f88699720069031c33305870d2324bc5d059dfc380beae27f5a60278bc5560178596e6a2d22af957205ed75a2df145316d8999cf4b034c
 AUX neutron-server.confd 70 SHA256 40d09a699fc3bced40c5a9dc7394a76c40c245b579fc270909966e11485564d7 SHA512 79f1a40486c37b2c3486b4ef015864f6b20ee89b05d788ce6ade8af934e2c160da9e0495d22e941a717072c1d8ca3b77963a3ec06f3ec25a3f8af8b24a4e40a0 WHIRLPOOL 59f9ac13d58fd76014090988c642d4cb244d51726fb5733cc30e7fbba5c22226ef955f8e8021dad04ab457df0fe5879d13af8c40a6913d03c15bffb48cf4a5ac
 AUX neutron.initd 792 SHA256 2170e60f05a3f41b47b80def27195fc3b67517adcdf8c6d53765cc8c552861d5 SHA512 aeaef18f5b0f29b9eddb2d76a640cd3e11af6bd211d837c2158e46f369aeebb915d5ca1deb354970fabe788478a3c6cb82f1886a85bdbdae9205c8017a89f0f4 WHIRLPOOL 77bd8b0eed45ab62314379239e19915b1368f8fbe069d22fa36ceab730780a920b6cbbb5aef85b053cfd66716775499689c874e91bcbc0c296a52140a26e7fab
@@ -13,7 +16,24 @@ AUX neutron.sudoersd 117 SHA256 b40ea04a95deedbb66fe504df61b55905cbd746e5ba26321
 DIST neutron-2014.2.3.tar.gz 2077226 SHA256 1af8df2a2ef4294e76546325a16ccb8ede001eee0392b877b80cfd04a48862dc SHA512 51eb9e6319a5368b77ef187210d0bcb76fe587e41f4a55bbb677ba940eda084fd93b186de95813b38fcf0d101f10b62b4d558bb342ef42850a417bb611d04295 WHIRLPOOL c536a6937bd4b88e9a6ba84d52fdddcd481791d34982878eab51d95ac0bd78aa79f37751283ebc3613db91bb3b648b3190b93ad697281bc33baf88f365a6df9f
 EBUILD neutron-2014.2.3.ebuild 7522 SHA256 597ba6828e67bcb479d1b1ebb6c3284a605caa80da0a58f30d0bc5b78295fedf SHA512 36363f11aba6a9099962752a66d69b42c65bbef7bc6805833ce84210889d2b775825c626b4b573a5554f86a54b15ad7c8336aadec8e6b54fc3448d512cb19421 WHIRLPOOL 777e3923cff07cc923c934f19a11d61fc3fa245406dfe7056e74b0e30440fd6b3ddd28015c3f739112b4e31e49b7351b829033a0d2c40551bceeb9e7c921b3b1
 EBUILD neutron-2014.2.9999.ebuild 7534 SHA256 a6bbe0d0c069645b7c31fd8e9913314e51f30ef4d9d344ca8d2f454fbb9a7272 SHA512 630c812b041f66052c6de41f682a42d67746d218e81ddde1d9b0f2b9dc1824d4bb80a7b4f7c011d39b15e2f3f468ebacdbf03c50d3b4bca1140e881b0b2b61b1 WHIRLPOOL 28d17074d7b3e0173827884a0b56fca04c1b53c410bbbf366cb9e69f03149d036d02933841d35ad289a55d9a66220ba24af8a60ca3e1f4f81a9a0148e1300802
-EBUILD neutron-2015.1.0.ebuild 8463 SHA256 6ecad36756a78da5558014a016a13d668ae8942e95759f40334efa328dfddd8a SHA512 f23a4c214c7b45e3e1028ac2af557efd2c98a07dc19f8278dbf1e98c6c306e61288b0d44179aa405be342169083144f39c28ca18c2bb29df3d7fd0160415c096 WHIRLPOOL 3792dfb1128c713dc1fa42014e73f767bdc303f24042157a37f63b2304d49fee75675de595326c5781bd30cffc30e4993528069346d7ae4a2f7a16cf4ea8a844
-EBUILD neutron-2015.1.9999.ebuild 8461 SHA256 f26dba4dd8a7935e4badd4e964fda77a9c81885e85ea8f2161bed0d3999b1354 SHA512 931d0eb7f136b7d21b3eeaf8f4431d2dbd052e31569d3dfc4419a2e84af21d84851fd1f895ade9aceadbc4e0f8ba002851482545584a58c0dbee690da6e4d43c WHIRLPOOL dc95ff55de6037bc3ab722952aab7d408d5742d62177f978491efdde4322c7273abbd3d1a63c95470eac3eaa0103ce54424bf817d3a022d463bde5e7e2433492
-MISC ChangeLog 16514 SHA256 857fab5b17881268f64b64ef1c514df63db2c90a515cd95290a0b2eb6e78107e SHA512 813cc17bfed3026c88d45876a87482a5a27231cf703d29b8a0f7009d90d0c252435be6d3bf11a9165732506c5750f916c876b86fbb092eec65d3915ab7546dac WHIRLPOOL c7505bc69d2b6a71c26e29f29ef07405d477fd1d8a339a45429d7c9381a3eecb9a046d2db812de00a8c094d0297c43667524322ec9310c447f6e3f3a997e3b9e
+EBUILD neutron-2015.1.0.ebuild 8840 SHA256 82ef60eaa82608ae73229191d885df3fc9d56d22dacda893979f54261b200f77 SHA512 6cf038d87e51212d3e66261d24cb646ea45172669936c146994511051c377d7df2d95a8d510ac6914def6bcaad02db401369b7ec09497a3150d7372a81ea0530 WHIRLPOOL d91b4dbe21db0cca1619a6bfc20a921e0621d9f4a2318e67c239fa21e8e51ab08c9dd0c9ea6087c7cb0a4626f4f97e88277b751c3fdb5058309c584e0d30aefe
+EBUILD neutron-2015.1.9999.ebuild 8838 SHA256 837197efd7dd2a24bed8c15ee8907d5ba82e259e78e44e434fdd9c209d96619c SHA512 7a764e407f6d7a9616959087e1cf74a358e536bc245286fc4331a3f78be778e1692ddf5eb2c82df80c55b8d0719f85a51c429c43b3303b6c733e3f745e0c86d1 WHIRLPOOL 130a6d13608fc6d528ab5ed250e97ec57d04e0cf88c458b71f42e261f1d56467ced026f7916fac40bc9541e335b291af7b305b58314dcddd2cf6ddf05bca7c93
+MISC ChangeLog 16785 SHA256 175c2fcfd29074a5bd84dce952415ebfd60757370565bac7891d19d291bc7e49 SHA512 7c9d4a34ba1db1dbb5dcdea49bfb9123e6bc133bf65fc0f48d55d988d3e0626c4837f09f1845760b282bb2386fc682c930c6ebb0f46d0cbf738a399b8f750219 WHIRLPOOL d1607b6ca20b48d7e7bb1c808400c7b29224e97a75ea7807064c374a96b823515c09292e0420d1ed9aa0edbda35627dc53a44d4c42f11de47dd52a1458287354
 MISC metadata.xml 1296 SHA256 7d6de6c9dc0602e7ea1147c40e8798aa61e01a891eade2b291628850d52889ab SHA512 e49d4872a6fefdb93f20665cf1a176744a1eaa3c068617dbb41e2591d084776d55334997c8046d725e84f5a7280481392f3fccf42f6cb02bbf1751d43076c49d WHIRLPOOL 0b3e08407b951bffdaa54e646d35c000e5b1df43381132386b77056e26773d6344ec7ace4b7a87ae14f29090fcdd490f05730ece3597b8e7a2d4389dfe816312
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJVSjI8AAoJEGSje+quGaTouNwQAL7EP8nls0/JAXtdFyUb+lTx
+6esIuZ7cs3Poqz0KrW7vNm8MD4h0CzqbPars1iZ0s2NTbBYzHjLshAFlAfzzasB+
+XwJ40Jg97dv6mJ7xUSbYtwZz5Gw5WreQwaORYCWNBMIrVwZgbhs8ZJ1EkI0sOxCx
+IRGP5FfsayFJ5guuYL7x7Vq6LOL9v8+Jt4cDT+LYU0fKe1IWDTUYtrs0PEm5JrNm
+sromQmFKPU9SqYFFzeqg40FKKstAB3TKbPwayVJu0+MXKM9cjfS3qCVpyYWSTWij
+E78OT64oXbZnuc/c/LZ+8mLtaOJvcF4eJYLq2ZFX31hvEq0UXNwL1D/2Ebvg/w4e
+reII2rWqAIdrGJ+M2ZT+30f5QN6MIvxwdGnq1DhtXC3s9ZjNtIqt6fmyXEgj1Fqb
+z7hdKaY17E124wXxye3j+5nWkcm5Avr0K2ojOK3RZfHM5p/Wh7pv2YZY/3vXENZS
+8nMHcILi9d8py55YQhWVQMW70CRG4+Z0ee1coBtQB2/8E7yOlSKsunUDXr47dV2D
+230FNvD5Pp1gyq6DqswUx6AzA1qJ5WvGM6O/ubqhXwzzAC2YNyVpHkgDUjGdbaNm
+XRxSjsZLqOaKC/e03J1ukA7SrPmrz120GodvszMZtSfqOnhaCZqNsFA5DeVyLlHi
++nVOz3dHUp3DucGBEbdm
+=GSh+
+-----END PGP SIGNATURE-----
diff --git a/sys-cluster/neutron/files/neutron-linuxbridge-agent.confd b/sys-cluster/neutron/files/neutron-linuxbridge-agent.confd
index 19bb4f9de0fc..fdd4ed4865b4 100644
--- a/sys-cluster/neutron/files/neutron-linuxbridge-agent.confd
+++ b/sys-cluster/neutron/files/neutron-linuxbridge-agent.confd
@@ -1 +1 @@
-NEUTRON_CONFS=("/etc/neutron/neutron.conf" "/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini")
+NEUTRON_CONFS=("/etc/neutron/neutron.conf" "/etc/neutron/plugins/ml2/ml2_conf.ini" "/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini")
diff --git a/sys-cluster/neutron/files/neutron-openvswitch-agent.confd b/sys-cluster/neutron/files/neutron-openvswitch-agent.confd
index eba422c2c716..30b10b69bbfb 100644
--- a/sys-cluster/neutron/files/neutron-openvswitch-agent.confd
+++ b/sys-cluster/neutron/files/neutron-openvswitch-agent.confd
@@ -1 +1 @@
-NEUTRON_CONFS=("/etc/neutron/neutron.conf" "/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini")
+NEUTRON_CONFS=("/etc/neutron/neutron.conf" "/etc/neutron/plugins/ml2/ml2_conf.ini" "/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini")
diff --git a/sys-cluster/neutron/neutron-2015.1.0.ebuild b/sys-cluster/neutron/neutron-2015.1.0.ebuild
index ac92a2b94600..ff06707c64af 100644
--- a/sys-cluster/neutron/neutron-2015.1.0.ebuild
+++ b/sys-cluster/neutron/neutron-2015.1.0.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/sys-cluster/neutron/neutron-2015.1.0.ebuild,v 1.2 2015/05/01 17:27:21 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2015.1.0.ebuild,v 1.3 2015/05/06 15:24:16 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -228,3 +228,13 @@ python_install_all() {
 	use doc && local HTML_DOCS=( doc/build/html/. )
 	distutils-r1_python_install_all
 }
+
+pkg_postinst() {
+	elog
+	elog "neutron-server's conf.d file may need updating to include additional ini files"
+	elog "We currently assume the ml2 plugin will be used but do not make assumptions"
+	elog "on if you will use openvswitch or linuxbridge (or something else)"
+	elog
+	elog "Other conf.d files may need updating too, but should be good for the default use case"
+	elog
+}
diff --git a/sys-cluster/neutron/neutron-2015.1.9999.ebuild b/sys-cluster/neutron/neutron-2015.1.9999.ebuild
index 0077703a9dc6..8ef3474f6c45 100644
--- a/sys-cluster/neutron/neutron-2015.1.9999.ebuild
+++ b/sys-cluster/neutron/neutron-2015.1.9999.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/sys-cluster/neutron/neutron-2015.1.9999.ebuild,v 1.2 2015/05/01 17:27:21 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2015.1.9999.ebuild,v 1.3 2015/05/06 15:24:16 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -228,3 +228,13 @@ python_install_all() {
 	use doc && local HTML_DOCS=( doc/build/html/. )
 	distutils-r1_python_install_all
 }
+
+pkg_postinst() {
+	elog
+	elog "neutron-server's conf.d file may need updating to include additional ini files"
+	elog "We currently assume the ml2 plugin will be used but do not make assumptions"
+	elog "on if you will use openvswitch or linuxbridge (or something else)"
+	elog
+	elog "Other conf.d files may need updating too, but should be good for the default use case"
+	elog
+}