[bootstrap] Add mcollective and net_probe plugin to bootstrap; set it to connect to master node.

bootstrap/bootstrapbuild.sh

@@ -43,7 +43,8 @@ INITRD_FS=${BASEDIR}/initrd-fs
 INITRD_LOOP=${BASEDIR}/initrd-loop
 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,rubygems
+DEBOOTSTRAP_INCLUDE=less,vim,bash,net-tools,isc-dhcp-client,rsyslog,cron,iputils-ping,openssh-server,ruby-httpclient,ruby-json,ohai,rubygems\
+,mcollective,python-scapy
 DEBOOTSTRAP_EXCLUDE=
 
 ORIG=${BASEDIR}/orig
@@ -428,7 +429,7 @@ echo "Adding root autologin on tty1 ..."
 sed -i -e '/exec/c\exec /sbin/getty -8 -l /usr/bin/autologin 38400 tty1' ${INITRD_LOOP}/etc/init/tty1.conf
 
 ###########################
-# INJECTING ESTRA FILES
+# INJECTING EXTRA FILES
 ###########################
 echo "Syncing system ..."
 cp -r ${SYNC}/* ${INITRD_LOOP}

bootstrap/sync/etc/rc.local

@@ -3,5 +3,6 @@
 apt-get update
 
 flock -w 0 -o /var/lock/agent.lock -c "/opt/nailgun/bin/agent > /var/log/agent.log 2>&1" || true
+fix-mcollective-config || true
 
 exit 0

bootstrap/sync/usr/bin/fix-mcollective-config

@@ -0,0 +1,4 @@
+#!/bin/sh
+masternode_ip=`sed -r 's/^.*url=http:\/\/([^/]+)\/.*$/\1/' /proc/cmdline`
+sed -i "s/plugin.stomp.host= .*\$/plugin.stomp.host= $masternode_ip/" /etc/mcollective/server.cfg
+service mcollective restart

config.mk

@@ -1,7 +1,7 @@
 
 BINARIES_DIR:=binaries
 ifndef BOOTSTRAP_REBUILD
-BOOTSTRAP_REDUILD:=0
+BOOTSTRAP_REBUILD:=0
 endif
 
 MIRROR_URL:=http://srv08-srt.srt.mirantis.net/mirror

requirements-deb.txt

@@ -12,6 +12,7 @@ libapache2-svn
 libhttpclient-ruby
 libjson-ruby
 libxml2-dev
+mcollective
 ntp
 ohai
 python-dev
@@ -19,6 +20,7 @@ python-django
 python-ipaddr
 python-paramiko
 python-pip
+python-scapy
 python-virtualenv
 redis-server
 rsync