[bootstrap] Modified bootstrap solo -> agent
This commit is contained in:
parent
4e0bae41ad
commit
ddb783cc72
@ -41,8 +41,7 @@ INITRD_FS=${BASEDIR}/initrd-fs
|
|||||||
INITRD_LOOP=${BASEDIR}/initrd-loop
|
INITRD_LOOP=${BASEDIR}/initrd-loop
|
||||||
INITRD_MODULES=${BASEDIR}/modules
|
INITRD_MODULES=${BASEDIR}/modules
|
||||||
|
|
||||||
|
DEBOOTSTRAP_INCLUDE=less,vim,bash,net-tools,isc-dhcp-client,rsyslog,cron,iputils-ping,openssh-server,ruby-httpclient,ruby-json,ohai
|
||||||
DEBOOTSTRAP_INCLUDE=less,vim,bash,net-tools,isc-dhcp-client,rsyslog,cron,iputils-ping,openssh-server,libhttpclient-ruby,chef
|
|
||||||
DEBOOTSTRAP_EXCLUDE=
|
DEBOOTSTRAP_EXCLUDE=
|
||||||
|
|
||||||
ORIG=${BASEDIR}/orig
|
ORIG=${BASEDIR}/orig
|
||||||
@ -432,18 +431,19 @@ sed -i -e '/exec/c\exec /sbin/getty -8 -l /usr/bin/autologin 38400 tty1' ${INITR
|
|||||||
echo "Syncing system ..."
|
echo "Syncing system ..."
|
||||||
cp -r ${SYNC}/* ${INITRD_LOOP}
|
cp -r ${SYNC}/* ${INITRD_LOOP}
|
||||||
|
|
||||||
echo "Injecting cookbooks and configs for chef-solo ..."
|
|
||||||
NAILGUN_DIR=${INITRD_LOOP}/opt/nailgun
|
NAILGUN_DIR=${INITRD_LOOP}/opt/nailgun
|
||||||
|
|
||||||
mkdir -p ${NAILGUN_DIR}/solo
|
#echo "Injecting cookbooks and configs for chef-solo ..."
|
||||||
cp ${SOLO}/solo.json ${NAILGUN_DIR}/solo/solo.json
|
#mkdir -p ${NAILGUN_DIR}/solo
|
||||||
cp ${SOLO}/solo.rb ${NAILGUN_DIR}/solo/solo.rb
|
#cp ${SOLO}/solo.json ${NAILGUN_DIR}/solo/solo.json
|
||||||
|
#cp ${SOLO}/solo.rb ${NAILGUN_DIR}/solo/solo.rb
|
||||||
|
|
||||||
echo "Disabling chef-client ..."
|
#echo "Disabling chef-client ..."
|
||||||
chroot ${INITRD_LOOP} /usr/sbin/update-rc.d chef-client disable
|
#chroot ${INITRD_LOOP} /usr/sbin/update-rc.d chef-client disable
|
||||||
|
|
||||||
mkdir -p ${NAILGUN_DIR}/cookbooks
|
echo "Injecting agent ..."
|
||||||
cp -r ${REPO}/cookbooks/agent ${NAILGUN_DIR}/cookbooks
|
mkdir -p ${NAILGUN_DIR}/bin
|
||||||
|
cp -r ${REPO}/bin/agent ${NAILGUN_DIR}/bin
|
||||||
|
|
||||||
echo "Injecting bootstrap ssh key ..."
|
echo "Injecting bootstrap ssh key ..."
|
||||||
mkdir -p ${INITRD_LOOP}/root/.ssh
|
mkdir -p ${INITRD_LOOP}/root/.ssh
|
||||||
@ -459,7 +459,8 @@ rm ${INITRD_LOOP}/etc/apt/sources.list
|
|||||||
# UMOUNTING
|
# UMOUNTING
|
||||||
###########################
|
###########################
|
||||||
|
|
||||||
if (mount | grep -q ${INITRD_LOOP}); then
|
echo "Trying to umount initrd loop ..."
|
||||||
|
if (mount | grep -q `readlink -f ${INITRD_LOOP}`); then
|
||||||
echo "Umounting ${INITRD_LOOP} ..."
|
echo "Umounting ${INITRD_LOOP} ..."
|
||||||
umount ${INITRD_LOOP}
|
umount ${INITRD_LOOP}
|
||||||
fi
|
fi
|
||||||
|
1
bootstrap/sync/etc/cron.d/agent
Normal file
1
bootstrap/sync/etc/cron.d/agent
Normal file
@ -0,0 +1 @@
|
|||||||
|
*/5 * * * * root flock -w 0 -o /var/lock/agent.lock -c "/opt/nailgun/bin/agent > /var/log/agent.log 2>&1"
|
@ -1 +0,0 @@
|
|||||||
*/5 * * * * root flock -w 0 -o /var/lock/chef-solo.lock -c "apt-get update; /usr/bin/chef-solo -l debug -c /opt/nailgun/solo/solo.rb -j /opt/nailgun/solo/solo.json"
|
|
@ -2,6 +2,6 @@
|
|||||||
|
|
||||||
apt-get update
|
apt-get update
|
||||||
|
|
||||||
flock -w 0 -o /var/lock/chef-solo.lock -c "/usr/bin/chef-solo -l debug -c /opt/nailgun/solo/solo.rb -j /opt/nailgun/solo/solo.json" || true
|
flock -w 0 -o /var/lock/agent.lock -c "/opt/nailgun/bin/agent > /var/log/agent.log 2>&1" || true
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
|
Loading…
Reference in New Issue
Block a user