lets use a better cloud.cfg

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

4 files changed, 207 insertions, 6 deletions

diff --git a/app-emulation/cloud-init/ChangeLog b/app-emulation/cloud-init/ChangeLog
index 7ac1c8864de2..22d45337e79d 100644
--- a/app-emulation/cloud-init/ChangeLog
+++ b/app-emulation/cloud-init/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/cloud-init
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/cloud-init/ChangeLog,v 1.14 2015/03/08 23:37:34 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/cloud-init/ChangeLog,v 1.15 2015/06/08 01:11:20 prometheanfire Exp $
+
+*cloud-init-0.7.5-r3 (08 Jun 2015)
+
+  08 Jun 2015; Matthew Thode <prometheanfire@gentoo.org>
+  +cloud-init-0.7.5-r3.ebuild, +files/cloud.cfg:
+  lets use a better cloud.cfg
 
   08 Mar 2015; Pacho Ramos <pacho@gentoo.org> cloud-init-0.7.6.ebuild:
   x86 stable, bug 540290
diff --git a/app-emulation/cloud-init/Manifest b/app-emulation/cloud-init/Manifest
index 9b04fa253c46..269dff551fd7 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -2,17 +2,28 @@
 Hash: SHA256
 
 AUX cloud-init-0.7.5-tests-exclude.patch 534 SHA256 9d2a13365551334bdbdbd9c243ba3413b66f47dd36ae94727c5336fb013113bb SHA512 b59bdcb5a5c6c7891a62c67c7bea83c42f00b2458959341fde33520dc02d65fe4a29a344f84c4f94c166a37bd98c19b596ef92eb51760228a2945b67f919087a WHIRLPOOL a8126ba0641ccd700ab7d58f81815c1a15e5c4289536aa9db6504b47a218d18c232062c6e0a4f149a87b70f2cfea9599876dc1d05693b26079c199107f496fa7
+AUX cloud.cfg 2288 SHA256 440c69879e875da844db0d0c01b93f7ae4b85c2d98b15c87321ff0699e1a5c44 SHA512 454ae0e473dcb0c30be65c11f63328d8b9b62b4653efe5d29bcfcdcb84fd66bdff5f5f33aa6e706a9eb35131b91f322b110c10328a537f0c2db202817eeb6653 WHIRLPOOL 4a42dca664229f041d0ff8cf9e377965eb4951b5f50647b2476a33a2d2292e7f54dc86f4dc39551f0d6731814231e9b78dd5ec5c494f87e4493480497dd411df
 DIST cloud-init-0.7.5.tar.gz 503717 SHA256 a92bb83809c139a7db378916414c18b0819e306852d6c60dd89388868857ed33 SHA512 79e1e4a9e1130a3a9deb0482278215baf5ed41e02beebed0a2c6fac4e215340a9537158bd259758a2e074f334c0c0b9e7b936c23eeb9c848c67f7e7835cf0f5d WHIRLPOOL 7d92a0e1b6a3faf550bc442b02c117280c47d160e7e318d9fb859d6d8b59a0ef947d057dfb615bd925420a25ca28852742ee87ffd6066664faf640ca53a13073
 DIST cloud-init-0.7.6.tar.gz 515670 SHA256 9e8fd22eb7f6e40ae6a5f66173ddc3cc18f65ee406c460a728092b37db2f3ed7 SHA512 aa2397328afda8e77ed6d642e7642f41a4b4b5bcd3d0e87056aa8c88b56624ec65c57cfc66b0d13ccc235f1840baf1d577316974902a0439cf2f2eb0f8eef36d WHIRLPOOL 639a556e51b4b4b180951f9e481f9a0dcd45067d1d5760ce7e871ceea8bbb4e195258d96273d3ef88c7e2f2520318e9172c3ad0cb23d6ad0ae1835e17087e3a5
 EBUILD cloud-init-0.7.5-r1.ebuild 1659 SHA256 b1b78f80550051f716b6b48fdf4855a251016d536dcc470041f39f15516269bd SHA512 33300619cd99e488f9255ef08ecb73d7b29b76271e28c541926208436ffaeddac7671f3082897ff84382a9fb9d524fc4cc78a32403292f4b5a1fa8d81419acc7 WHIRLPOOL f6da626c00c23c53a3607dd9c9a150f8c5bc28ed21ec44631e8f57503c0a6f114215b570b11b9b181a9081de6e3e06f05bedcb88abb1673ed2b000ff6191fcf0
 EBUILD cloud-init-0.7.5-r2.ebuild 2411 SHA256 e4a58be7d11d57a75c8068169801c6f4fa0d6b65491e6f5012846c68ca5101c4 SHA512 5de768692d13c365b23570a3fb53ac594b62954965cad2f72efebc30d74be6905cf620ed06339ce6c97ed9e858c9201cab36be9feb91fc7df320d475e89cedfe WHIRLPOOL 7ae0e57a4617473ab781536b105e38b3f66dbe00f9865a061f41526a1cd524b36dba9875494bb6e5360340509c0617d2076a5e5e0bceec9bd023df93e3cd96a5
+EBUILD cloud-init-0.7.5-r3.ebuild 2494 SHA256 4df093d1ce9383a1c2d7247a41fed2b774088d0a38ec226b151a55da2a4022ba SHA512 9f6392eb759e857d8656a8aecd475e2b05f77717a48ae8a687e5faea11f4fe6dd7b68cdb07072fb9760d7e30a192b54e41f4ec2d8572e89796af30345e658a60 WHIRLPOOL 18ffe9720d384c7b6f591b43f90bb65a4d33b31d6e960005e2441501784b351e02a31db9db49cace162be5a4ebcd24df10785cb42561b3405d5353b77e698ebd
 EBUILD cloud-init-0.7.6.ebuild 2568 SHA256 00b1e414bd07ad55d6b5aa94bf17448f6627510de2ce869f3914dc0942962057 SHA512 643cd51cefafd4ebf81390edb37ce5e4b1ce8a1d15ed2cb655c4101e342348148957f4d4563fab1faa57c27d433832898f06652b59e00319d017f1164d27043e WHIRLPOOL e731eb613b42fafd2f3f5151d89ce3b30172d40d88df33a83547e9ca268be88babf56fbe0eccbe7140c77ffc4deecd3779011f05598e3bb0ab5ff2688c5b555a
-MISC ChangeLog 2614 SHA256 6b43e2aded3b65efee15d98629aa231522480a686651aaf449ded8639b124e7a SHA512 363c6b2b1f294923324b2bf1ec77f6d6d1f1f3c99d4cd331a49c3be2fd6b99e955f5620f8402e2064eb59c0a7f80dccd98b5a6e6bf08efd8706b6a8d02303065 WHIRLPOOL fbb2ada48f63d13103849e9b74010190cd7d92eb3c2e55fa6969ef1db28ce6e0b82bcb4df1cfb5189251b964bb444ec8e5446c6c71fa803275be6a9ddeadd6a8
+MISC ChangeLog 2796 SHA256 520d19f2bd81ff809216cb47fbe78739e98ad75e73da0a6677b1b99f2df66034 SHA512 df93bf5be819cfeb360732e370e07eeffa83911c67f5b5996cb670faa2dc0b63cacf16e7a6a049adeba1fb9285f28ea251ef5a0aee5906dce674df23f2753230 WHIRLPOOL bf117c517103eccf85cb64954c39a5ac0bf31f8ab6920e1387dc47630edc7da5986006ae2ee3731cdc53cc3fe8ba68f8dead973348667a4be4965b300f49ec04
 MISC metadata.xml 484 SHA256 def0cfb2c35a0590095ae04153f8db9c69c3b3c88dc26e09754b9b87e4c57bea SHA512 d5100eeb140cd23c0f75681f765e4844215f994c573c62eb34a2783285509a3609d6f7dbbf75b09a60f3158152904ee1db2eb20577663b9fbd996cf7d2cbd15c WHIRLPOOL 7d5fbdeaf7dd7a4efe4b15e1b52a67ff11cb96dfc4123406cf5c1d08dd5106dbe96c0eac0fb508eb648015cc342c5a047b80bb1d17378a4147734fa4ff07db70
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
 
-iEYEAREIAAYFAlT83TsACgkQCaWpQKGI+9SDBACeOwYYDvVU3Z8kmx0TPIz5YTNn
-DqEAoIQik8Athz7vGq+ZNPfv9B7LyWWw
-=Vmb4
+iQIcBAEBCAAGBQJVdOvRAAoJEGSje+quGaToeooP/2laA5cAx0qHU+71D4X4uQGF
+/dFM47i0LerjBz1CDIaOBIPXBT5v2MX6gJafA6DeSEhOfs03cQO763eUFU2ctuPx
+eh2BTKFYzSzSfBql53phCjZGZr5BNdoyq2x0e5bAhTwikAd/7SYISY4t1Q+RORtd
+iAT4e/w07cW/spnEn4jwjF/WDmalHiuH9/ILb/FB6sLzvj2N96+/adl2CS76swdu
+qrN1mMIGZIQwdCgHJd3z+foCIgjT/ueOS+EUjC18M7g4udjwM/YomuI7EFlzN+2M
+lnKN19gQB6s8LPawTpu5F99B3BVD0MzwcfQYKi0Ojt2eQPLENZNME89Msvpjm37Q
+ut9+T+qMKKSKn0NWKLLTdWGmfgU0NFT+bEQUtDbwBJNxsyStCZOL/QjUjXA9gFSF
+ASA/iVfX2QUcuyUxIqYT5jkdDng9oZWtrg9ucAlIJpWA/1Ex+cwmoo+JQtleIChA
+vzPU7eezq1zktTROQoG1AZMZifztelmV52MQx60gky1FKW6M+tj1xw8+/f3aII8J
+a6Fuo2b2HZcuX19rvyleAhX3SmR0ouX5+sQbgQ/GfjyXuobKmsiCkWyHJN5R5BEz
+Rb8H9chS+N8sFta7CNAj16/trWWLQILAfNRSgpyEu51u6/9n++5B51aEr3SW4NFh
+qOIp5BcNmj/ClHm21cl7
+=pwqD
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/cloud-init/cloud-init-0.7.5-r3.ebuild b/app-emulation/cloud-init/cloud-init-0.7.5-r3.ebuild
new file mode 100644
index 000000000000..737db0bf0487
--- /dev/null
+++ b/app-emulation/cloud-init/cloud-init-0.7.5-r3.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/cloud-init/cloud-init-0.7.5-r3.ebuild,v 1.1 2015/06/08 01:11:20 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=TRUE
+
+inherit distutils-r1 eutils multilib systemd
+
+DESCRIPTION="Cloud instance initialization"
+HOMEPAGE="http://launchpad.net/cloud-init"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="
+	dev-python/cheetah[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	dev-python/oauth[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	dev-python/pyserial[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		${CDEPEND}
+		>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
+		dev-python/mocker[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pep8[${PYTHON_USEDEP}]
+		dev-python/pyflakes[${PYTHON_USEDEP}]
+		dev-python/pylint[${PYTHON_USEDEP}]
+		sys-apps/iproute2
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	virtual/logger
+"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}"/${P}-tests-exclude.patch
+	)
+
+	distutils-r1_python_prepare_all
+
+	# Skip SmartOS tests since they don't generally apply and don't skip based
+	# on environment.  Documented in bug #511384.
+	rm tests/unittests/test_datasource/test_smartos.py
+}
+
+python_test() {
+	# These tests are not broken but expect to locate an installed exe file
+	# other than where a gentoo system installs it;  (/bin/ip sought in /sbin)
+	# See cloudinit/sources/DataSourceOpenNebula.py for possible patching
+	sed \
+		-e 's:test_hostname:_&:' \
+		-e 's:test_network_interfaces:_&:' \
+		-i tests/unittests/test_datasource/test_opennebula.py
+
+	emake test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doinitd "${S}"/sysvinit/gentoo/cloud-config
+	doinitd "${S}"/sysvinit/gentoo/cloud-final
+	doinitd "${S}"/sysvinit/gentoo/cloud-init
+	doinitd "${S}"/sysvinit/gentoo/cloud-init-local
+
+	systemd_dounit "${S}"/systemd/cloud-config.service
+	systemd_dounit "${S}"/systemd/cloud-config.target
+	systemd_dounit "${S}"/systemd/cloud-final.service
+	systemd_dounit "${S}"/systemd/cloud-init-local.service
+	systemd_dounit "${S}"/systemd/cloud-init.service
+
+	rm /etc/cloud/cloud.cfg
+	insinto /etc/cloud
+	doins "${FILESDIR}/cloud.cfg"
+}
diff --git a/app-emulation/cloud-init/files/cloud.cfg b/app-emulation/cloud-init/files/cloud.cfg
new file mode 100644
index 000000000000..f20ab5a1544f
--- /dev/null
+++ b/app-emulation/cloud-init/files/cloud.cfg
@@ -0,0 +1,96 @@
+# The top level settings are used as module
+# and system configuration.
+
+# A set of users which may be applied and/or used by various modules
+# when a 'default' entry is found it will reference the 'default_user'
+# from the distro configuration specified below
+users:
+   - default
+
+# If this is set, 'root' will not be able to ssh in and they 
+# will get a message to login instead as the above $user (ubuntu)
+disable_root: true
+
+# This will cause the set+update hostname module to not operate (if true)
+preserve_hostname: false
+
+# Example datasource config
+# datasource: 
+#    Ec2: 
+#      metadata_urls: [ 'blah.com' ]
+#      timeout: 5 # (defaults to 50 seconds)
+#      max_wait: 10 # (defaults to 120 seconds)
+
+# The modules that run in the 'init' stage
+cloud_init_modules:
+ - migrator
+ - ubuntu-init-switch
+ - seed_random
+ - bootcmd
+ - write-files
+ - growpart
+ - resizefs
+ - set_hostname
+ - update_hostname
+ - update_etc_hosts
+ - ca-certs
+ - rsyslog
+ - users-groups
+ - ssh
+
+# The modules that run in the 'config' stage
+cloud_config_modules:
+# Emit the cloud config ready event
+# this can be used by upstart jobs for 'start on cloud-config'.
+ - emit_upstart
+ - disk_setup
+ - mounts
+ - ssh-import-id
+ - locale
+ - set-passwords
+ - grub-dpkg
+ - apt-pipelining
+ - apt-configure
+ - package-update-upgrade-install
+ - landscape
+ - timezone
+ - puppet
+ - chef
+ - salt-minion
+ - mcollective
+ - disable-ec2-metadata
+ - runcmd
+ - byobu
+
+# The modules that run in the 'final' stage
+cloud_final_modules:
+ - rightscale_userdata
+ - scripts-vendor
+ - scripts-per-once
+ - scripts-per-boot
+ - scripts-per-instance
+ - scripts-user
+ - ssh-authkey-fingerprints
+ - keys-to-console
+ - phone-home
+ - final-message
+ - power-state-change
+
+# System and/or distro specific settings
+# (not accessible to handlers/transforms)
+system_info:
+   # This will affect which distro class gets used
+   distro: gentoo
+   # Default user name + that default users groups (if added/used)
+   default_user:
+     name: gentoo
+     lock_passwd: True
+     gecos: gentoo
+     groups: [adm]
+     sudo: ["ALL=(ALL) NOPASSWD:ALL"]
+     shell: /bin/bash
+   # Other config here will be given to the distro class and/or path classes
+   paths:
+      cloud_dir: /var/lib/cloud/
+      templates_dir: /etc/cloud/templates/
+   ssh_svcname: sshd