abiquo-chef-agent 2.0.3 → 2.0.4

data/README.md

@@ -3,6 +3,14 @@ abiquo-chef-agent
 
 A simple boot time execution daemon that allow to execute the Chef configuration of an Abiquo virtual machine.
 
+## Installing
+
+Installation script currently targets a CentOS operating system. The script will install Chef and all the agent
+dependencies. The installation script must be run as root:
+
+    chmod +x install.sh
+    ./install.sh
+
 ## Contributing to abiquo-chef-agent
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet

data/Rakefile

@@ -2,6 +2,8 @@ require 'rubygems'
 require 'rake'
 require './lib/abiquo-chef-agent.rb'
 require 'jeweler'
+require 'rdoc/task'
+require 'rspec/core/rake_task'
 
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
@@ -19,14 +21,13 @@ Jeweler::Tasks.new do |gem|
   gem.add_runtime_dependency 'daemons'
   gem.add_runtime_dependency 'rest-client'
   gem.add_runtime_dependency 'xml-simple'
-  #  gem.add_development_dependency 'rspec', '> 1.2.3'
+  gem.add_development_dependency 'rspec', '> 1.2.3'
 end
 
 Jeweler::RubygemsDotOrgTasks.new
 
-task :default => :build
+RSpec::Core::RakeTask.new(:spec)
 
-require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = Abiquo::Chef::VERSION
 
@@ -35,3 +36,5 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+task :default => [:spec, :build]

data/{scripts/abiquo-chef-agent.init → dist/centos/abiquo-chef-run}

@@ -1,36 +1,36 @@
-#!/bin/sh
+#!/bin/bash
+# 
+# abiquo-chef-run Startup script for the Abiquo Chef Agent
 #
-# abiquo-chef-agent Abiquo Agent to Manage Chef Node initial registration
-#
-# chkconfig:   - 80 01
-# description: Abiquo Chef Agent
+# chkconfig: - 98 02
+# description: Startup script for the Abiquo Chef Agent.
 
 ### BEGIN INIT INFO
-# Provides: abiquo-chef-agent
+# Provides: abiquo-chef-run
 # Required-Start: $local_fs $network $remote_fs
 # Required-Stop: $local_fs $network $remote_fs
 # Should-Start: $named $time
 # Should-Stop: $named $time
 # Short-Description: Startup script for the Abiquo Chef Agent
-# Description: Abiquo Agent to Manage Chef Node initial registration
+# Description: Startup script for the Abiquo Chef Agent.
 ### END INIT INFO
 
-# Source function library.
-. /etc/rc.d/init.d/functions
+# Source function library
+. /etc/init.d/functions
 
-exec="/usr/bin/abiquo-chef-agent"
-prog="abiquo-chef-agent"
-config="/etc/sysconfig/abiquo-chef-agent"
+exec="/usr/bin/abiquo-chef-run"
+prog="abiquo-chef-run"
 
 [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
 
-lockfile=/var/lock/subsys/$prog
+pidfile=${PIDFILE-/var/run/chef/abiquo-chef-run.pid}
+lockfile=${LOCKFILE-/var/lock/subsys/$prog}
+options=${OPTIONS-}
 
 start() {
     [ -x $exec ] || exit 5
-    #[ -f $config ] || exit 6
     echo -n $"Starting $prog: "
-    $exec start
+    daemon abiquo-chef-run 
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile
@@ -39,15 +39,14 @@ start() {
 
 stop() {
     echo -n $"Stopping $prog: "
-    # stop it here, often "killproc $prog"
-    $exec stop
+    killproc -p $pidfile abiquo-chef-run
     retval=$?
     echo
     [ $retval -eq 0 ] && rm -f $lockfile
     return $retval
 }
 
-restart() {
+restart () {
     stop
     start
 }
@@ -62,14 +61,13 @@ force_reload() {
 
 rh_status() {
     # run checks to determine if the service is running or use generic status
-    status $prog
+    status -p $pidfile $prog
 }
 
 rh_status_q() {
     rh_status >/dev/null 2>&1
 }
 
-
 case "$1" in
     start)
         rh_status_q && exit 0

data/dist/centos/dhclient.conf

@@ -0,0 +1,7 @@
+option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;
+
+send host-name "<hostname>";
+request subnet-mask, broadcast-address, time-offset, routers,
+        domain-name, domain-name-servers, domain-search, host-name,
+        netbios-name-servers, netbios-scope, interface-mtu,
+        rfc3442-classless-static-routes, ntp-servers, vendor-encapsulated-options;

data/install.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+if [[ ${UID} -ne 0 ]]; then
+    echo "${0} must be run as root"
+    exit 1
+fi
+
+DIST="dist/centos"
+
+echo "Installing ntp..."
+yum --quiet --assumeyes install ntp
+
+echo "Installing Chef..."
+curl -L https://www.opscode.com/chef/install.sh | bash
+
+echo "Installing the Abiquo Chef Agent gem..."
+/opt/chef/embedded/bin/gem install abiquo-chef-agent
+
+ln -s /opt/chef/embedded/bin/abiquo-chef-run /usr/bin
+cp ${DIST}/abiquo-chef-run /etc/init.d
+chmod +x /etc/init.d/abiquo-chef-run
+
+chkconfig --add abiquo-chef-run
+chkconfig abiquo-chef-run on
+
+cp ${DIST}/dhclient.conf /etc/dhcp/
+
+echo "Done!"

data/lib/abiquo-chef-agent.rb

@@ -5,7 +5,7 @@ require 'time'
 module Abiquo
   module Chef
 
-    VERSION="2.0.3"
+    VERSION="2.0.4"
 
     class Config
       def self.chef_config_dir

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: abiquo-chef-agent
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -158,6 +158,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: 1.2.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: 1.2.3
 description: Abiquo Chef Agent
 email: ruby-gems@abiquo.com
 executables:
@@ -172,10 +188,10 @@ files:
 - README.md
 - Rakefile
 - bin/abiquo-chef-run
+- dist/centos/abiquo-chef-run
+- dist/centos/dhclient.conf
+- install.sh
 - lib/abiquo-chef-agent.rb
-- scripts/abiquo-chef-agent.init
-- scripts/debian/abiquo-chef-agent.conf.upstart
-- scripts/debian/chef-client.defaults
 - spec/data/bootstrap.xml
 - spec/data/bootstrap_empty_cert.xml
 - spec/data/bootstrap_empty_chef.xml

data/scripts/debian/abiquo-chef-agent.conf.upstart

@@ -1,16 +0,0 @@
-# abiquo-chef-agent - Abiquo Chef Client Wrapper
-#
-# Chef Client provides the Chef configuration management daemon
-
-description "Abiquo Chef Agent"
-
-start on (local-filesystems and net-device-up IFACE=eth0)
-stop on runlevel [!2345]
-
-pre-start script
-    test -x /usr/bin/abiquo-chef-run || { stop; exit 0; }
-    export RUBYOPT="-d"
-end script
-    
-exec /usr/bin/abiquo-chef-run 
-

data/scripts/debian/chef-client.defaults

@@ -1,4 +0,0 @@
-LOGFILE=/var/log/chef/client.log
-CONFIG=/etc/chef/client.rb
-INTERVAL=1800
-SPLAY=20