Clean up /etc/chef and install inotify-tools across all providers.

Author: mboersma

contrib/digitalocean/prepare-digitalocean-snapshot.sh

@@ -46,7 +46,7 @@ apt-get update
 apt-get -qy upgrade
 
 # install required packages
-apt-get install lxc-docker-0.7.6 curl git make python-setuptools python-pip -yq
+apt-get install lxc-docker-0.7.6 curl git inotify-tools make python-setuptools python-pip -yq
 
 # wait for docker to start
 while [ ! -e /var/run/docker.sock ] ; do
@@ -71,8 +71,9 @@ rm -rf /var/lib/cloud
 # purge SSH authorized keys
 rm -f /root/.ssh/authorized_keys
 
-# ssh host keys are automatically regenerated
-# on system boot by ubuntu cloud init
+# remove /etc/chef so contents can't intefere with
+# node being converged (i.e. old keys)
+rm -f /etc/chef/*
 
 # purge /var/log
 find /var/log -type f | xargs rm

contrib/ec2/prepare-ubuntu-ami.sh

@@ -39,7 +39,7 @@ apt-get update
 apt-get dist-upgrade -yq
 
 # install required packages
-apt-get install lxc-docker-0.7.6 curl git make python-setuptools python-pip -yq
+apt-get install lxc-docker-0.7.6 curl git inotify-tools make python-setuptools python-pip -yq
 
 # wait for docker to start
 while [ ! -e /var/run/docker.sock ] ; do
@@ -65,8 +65,9 @@ rm -rf /var/lib/cloud
 rm -f /home/ubuntu/.ssh/authorized_keys
 rm -f /root/.ssh/authorized_keys
 
-# ssh host keys are automatically regenerated
-# on system boot by ubuntu cloud init
+# remove /etc/chef so contents can't intefere with
+# node being converged (i.e. old keys)
+rm -f /etc/chef/*
 
 # purge /var/log
 find /var/log -type f | xargs rm

contrib/rackspace/prepare-rackspace-image.sh

@@ -40,7 +40,7 @@ apt-get update
 apt-get dist-upgrade -yq
 
 # install required packages
-apt-get install lxc-docker-0.7.6 curl git make python-setuptools python-pip -yq
+apt-get install lxc-docker-0.7.6 curl git inotify-tools make python-setuptools python-pip -yq
 
 # wait for docker to start
 while [ ! -e /var/run/docker.sock ] ; do
@@ -66,18 +66,12 @@ rm -rf /var/lib/cloud
 rm -f /home/ubuntu/.ssh/authorized_keys
 rm -f /root/.ssh/authorized_keys
 
-# ssh host keys are automatically regenerated
-# on system boot by ubuntu cloud init
-
 # remove /etc/chef so contents can't intefere with
 # node being converged (i.e. old keys)
 rm -f /etc/chef/*
 
 # purge /var/log
 find /var/log -type f | xargs rm
 
-# Sync call needs this package
-apt-get -yqq install inotify-tools
-
 # flush writes to block storage
 sync

contrib/vagrant/prepare-ubuntu-box.sh

@@ -42,7 +42,7 @@ apt-get update
 apt-get dist-upgrade -yq
 
 # install required packages
-apt-get install lxc-docker-0.7.6 git make python-setuptools python-pip -yq
+apt-get install lxc-docker-0.7.6 git inotify-tools make python-setuptools python-pip -yq
 
 # wait for docker to start
 while [ ! -e /var/run/docker.sock ] ; do
@@ -71,8 +71,9 @@ rm -rf /var/lib/cloud
 # rm -f /home/ubuntu/.ssh/authorized_keys
 rm -f /root/.ssh/authorized_keys
 
-# ssh host keys are automatically regenerated
-# on system boot by ubuntu cloud init
+# remove /etc/chef so contents can't intefere with
+# node being converged (i.e. old keys)
+rm -f /etc/chef/*
 
 # purge /var/log
 find /var/log -type f | xargs rm