Merge pull request #2235 from dm0-/gce

GCE OEM ACI fixes
This commit is contained in:
David Michael 2016-10-18 18:11:13 -07:00 committed by GitHub
commit da748e8dfa
7 changed files with 10 additions and 16 deletions

View File

@ -16,7 +16,7 @@ IUSE=""
DEPEND="dev-python/setuptools"
# These dependencies cover everything possibly called by the scripts.
# These dependencies cover all commands called by the scripts.
RDEPEND="
app-admin/sudo
dev-python/boto
@ -26,18 +26,10 @@ RDEPEND="
sys-apps/grep
sys-apps/iproute2
sys-apps/shadow
sys-libs/glibc
sys-libs/nss-usrfiles
"
S="${WORKDIR}/compute-image-packages-${PV}"
src_prepare() {
# Don't attempt to mess with our host keys.
sed -i -e '/set_host_keys/s/true/false/i' \
"${S}"/google_compute_engine/instance_setup/instance_config.py
}
src_compile() {
(cd "${S}" && exec python setup.py build)
}

View File

@ -0,0 +1 @@
coreos-oem-gce-0.0.1.ebuild

View File

@ -13,4 +13,6 @@ IUSE=""
RDEPEND="
app-emulation/google-compute-engine
sys-libs/glibc
sys-libs/nss-usrfiles
"

View File

@ -7,6 +7,11 @@ set -e
cat << 'EOF' > init.sh && chmod 755 init.sh
#!/bin/bash -ex
# Write a configuration template if it does not exist.
[ -e /etc/default/instance_configs.cfg.template ] ||
echo -e > /etc/default/instance_configs.cfg.template \
'[InstanceSetup]\nset_host_keys = false'
# Run the initialization scripts.
/usr/bin/google_instance_setup
/usr/bin/google_network_setup

View File

@ -16,9 +16,9 @@ IUSE=""
DEPEND=""
RDEPEND="
amd64? (
app-emulation/google-compute-engine
app-emulation/open-vm-tools
app-emulation/wa-linux-agent
coreos-base/coreos-oem-gce
coreos-base/nova-agent-container
coreos-base/nova-agent-watcher
dev-lang/python-oem

View File

@ -1,6 +0,0 @@
# Packages that we do not want to ship in OEM ACI images. Masking these is
# merely as a safe guard against pulling them in accidentally.
# OEM ACIs have no reason to include boot-related packages.
sys-boot/*
sys-kernel/*