diff options
author | Matthew Thode <prometheanfire@gentoo.org> | 2015-07-20 07:42:31 +0000 |
---|---|---|
committer | Matthew Thode <prometheanfire@gentoo.org> | 2015-07-20 07:42:31 +0000 |
commit | d5f035f01f2dba4639636d78c0bf7b1bb3f51bf1 (patch) | |
tree | 3313115880adf0f1a15a3acf3b8e50f2decd55bf /app-emulation | |
parent | Install examples into the proper place (bug #555250) (diff) | |
download | gentoo-2-d5f035f01f2dba4639636d78c0bf7b1bb3f51bf1.tar.gz gentoo-2-d5f035f01f2dba4639636d78c0bf7b1bb3f51bf1.tar.bz2 gentoo-2-d5f035f01f2dba4639636d78c0bf7b1bb3f51bf1.zip |
updating /etc/hosts template
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x33ED3FD25AFC78BA)
Diffstat (limited to 'app-emulation')
-rw-r--r-- | app-emulation/cloud-init/ChangeLog | 8 | ||||
-rw-r--r-- | app-emulation/cloud-init/cloud-init-0.7.6-r1.ebuild | 100 | ||||
-rw-r--r-- | app-emulation/cloud-init/files/hosts.gentoo.tmpl | 23 |
3 files changed, 130 insertions, 1 deletions
diff --git a/app-emulation/cloud-init/ChangeLog b/app-emulation/cloud-init/ChangeLog index 7704aedf691f..43720939287d 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.16 2015/06/09 11:07:19 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/cloud-init/ChangeLog,v 1.17 2015/07/20 07:42:31 prometheanfire Exp $ + +*cloud-init-0.7.6-r1 (20 Jul 2015) + + 20 Jul 2015; Matthew Thode <prometheanfire@gentoo.org> + +cloud-init-0.7.6-r1.ebuild, +files/hosts.gentoo.tmpl: + updating /etc/hosts template 09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml: Updating remote-id in metadata.xml diff --git a/app-emulation/cloud-init/cloud-init-0.7.6-r1.ebuild b/app-emulation/cloud-init/cloud-init-0.7.6-r1.ebuild new file mode 100644 index 000000000000..463aadf4407b --- /dev/null +++ b/app-emulation/cloud-init/cloud-init-0.7.6-r1.ebuild @@ -0,0 +1,100 @@ +# 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.6-r1.ebuild,v 1.1 2015/07/20 07:42:31 prometheanfire Exp $ + +EAPI=5 +PYTHON_COMPAT=( python2_7 ) + +inherit distutils-r1 eutils multilib systemd + +DESCRIPTION="EC2 initialisation magic" +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/jinja[${PYTHON_USEDEP}] + dev-python/jsonpatch[${PYTHON_USEDEP}] + dev-python/oauth[${PYTHON_USEDEP}] + dev-python/prettytable[${PYTHON_USEDEP}] + dev-python/pyserial[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] +" +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + ${CDEPEND} + >=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}] + dev-python/mocker[${PYTHON_USEDEP}] + dev-python/nose[${PYTHON_USEDEP}] + ~dev-python/pep8-1.5.7[${PYTHON_USEDEP}] + dev-python/pyflakes[${PYTHON_USEDEP}] + sys-apps/iproute2 + ) +" +RDEPEND=" + ${CDEPEND} + virtual/logger +" + +python_prepare_all() { + # Note: Gentoo places ip in /sbin/ not /bin/ + ebegin 'patching cloudinit/sources/DataSourceOpenNebula.py' + sed \ + -e '438s/sbin/bin/' \ + -i cloudinit/sources/DataSourceOpenNebula.py + STATUS=$? + eend ${STATUS} + [[ ${STATUS} -gt 0 ]] && die + + # https://bugs.launchpad.net/cloud-init/+bug/1380424 + ebegin 'patching tests/unittests/test_distros/test_netconfig.py' + sed \ + -e '177s/test_simple_write_freebsd/_&/' \ + -i tests/unittests/test_distros/test_netconfig.py + STATUS=$? + eend ${STATUS} + [[ ${STATUS} -gt 0 ]] && die + + # Note Gentoo installs its own RC files + ebegin 'patching setup.py' + sed \ + -e "144 s/'tests'/'tests.*', &/" \ + -e '163,167 d' \ + -i setup.py + STATUS=$? + eend ${STATUS} + [[ ${STATUS} -gt 0 ]] && die + + distutils-r1_python_prepare_all +} + +python_test() { + emake test +} + +python_install_all() { + keepdir /etc/cloud + + 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 + insinto /etc/cloud/templates + doins "${FILESDIR}/hosts.gentoo.tmpl" + + 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 +} diff --git a/app-emulation/cloud-init/files/hosts.gentoo.tmpl b/app-emulation/cloud-init/files/hosts.gentoo.tmpl new file mode 100644 index 000000000000..bc0bca47c5ce --- /dev/null +++ b/app-emulation/cloud-init/files/hosts.gentoo.tmpl @@ -0,0 +1,23 @@ +## template:jinja +{# +This file /etc/cloud/templates/hosts.gentoo.tmpl is only utilized +if enabled in cloud-config. Specifically, in order to enable it +you need to add the following to config: + manage_etc_hosts: template +-#} +# Your system has configured 'manage_etc_hosts' as 'template'. +# As a result, if you wish for changes to this file to persist +# then you will need to either +# a.) make changes to the master file in /etc/cloud/templates/hosts.gentoo.tmpl +# b.) change or remove the value of 'manage_etc_hosts' in +# /etc/cloud/cloud.cfg or cloud-config from user-data +# +# The following lines are desirable for IPv4 capable hosts +127.0.0.1 {{fqdn}} {{hostname}} +127.0.0.1 localhost.localdomain localhost +127.0.0.1 localhost4.localdomain4 localhost4 + +# The following lines are desirable for IPv6 capable hosts +::1 {{fqdn}} {{hostname}} +::1 localhost.localdomain localhost +::1 localhost6.localdomain6 localhost6
\ No newline at end of file |