Last active
August 2, 2016 21:37
-
-
Save prometheanfire/285bc292724f8e6d86070df288d508a1 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
additional diff needed for nodepool to shortcut puppet | |
diff --git a/nodepool/elements/nodepool-base/finalise.d/89-unbound b/nodepool/elements/nodepool-base/finalise.d/89-unbound | |
index d931de0..96acda8 100755 | |
--- a/nodepool/elements/nodepool-base/finalise.d/89-unbound | |
+++ b/nodepool/elements/nodepool-base/finalise.d/89-unbound | |
@@ -21,6 +21,8 @@ if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then | |
fi | |
set -e | |
+mkdir /etc/unbound | |
+ | |
NODEPOOL_STATIC_NAMESERVER=${NODEPOOL_STATIC_NAMESERVER:-8.8.8.8} | |
# The puppet modules should install unbound. | |
dd of=/tmp/forwarding.conf <<EOF | |
diff --git a/nodepool/elements/openstack-repos/install.d/95-chown-jenkins b/nodepool/elements/openstack-repos/install.d/95-chown-jenkins | |
index eb657e9..60f0aba 100755 | |
--- a/nodepool/elements/openstack-repos/install.d/95-chown-jenkins | |
+++ b/nodepool/elements/openstack-repos/install.d/95-chown-jenkins | |
@@ -21,4 +21,6 @@ if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then | |
fi | |
set -e | |
+groupadd jenkins | |
+useradd -m -d /home/jenkins -g jenkins jenkins | |
chown -R jenkins:jenkins /home/jenkins | |
export ELEMENTS_PATH=project-config/nodepool/elements/ | |
export DISTRO=gentoo | |
export IMAGE_NAME=devstack-gate | |
export NODEPOOL_SCRIPTDIR=project-config/nodepool/scripts/ | |
export CONFIG_REF=master | |
export EXTRA_ELEMENTS= | |
DIB_INSTALLTYPE_pip_and_virtualenv=package DIB_INSTALLTYPE_simple_init=repo disk-image-create --no-tmpfs -o devstack-gate gentoo vm openstack-repos puppet nodepool-base cache-bindep infra-package-needs simple-init growroot |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment