abiquo-chef-agent 2.0.10 → 2.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5b4e63ac7b335b7e41addf06ca461b159c95d16
-  data.tar.gz: 5e50daf80b113985c4d8cc053688a3d173e43f71
+  metadata.gz: fd798c59832708256e7e44281b18d8dd1651ebe6
+  data.tar.gz: b3c7d71208b35cde739215e7889f3f61d06f57c0
 SHA512:
-  metadata.gz: 56628feb8938783520400aa7b9a2e8e0fb984aded2f318ad129293bcd3444e1b1588b1614391147448b826259dd8264e5e721d1d19a41cf93c79115b8bbbbeff
-  data.tar.gz: bf6971dc4de33aa0d66d413360803322e7799143f3461a9ad4eff02c3fb4c4ea56f9a36610402ad7195d0c1bea739e9729879d8bc70bffc7af03faf2e795c36b
+  metadata.gz: f1d0a8216934f8a02febbe5ebc6dbe799c75c9454e0f2378eab3e890ffd604b3f728d9fb5b451007162a1644a86bff6d432a530b4f542556337e739a19ee9dd6
+  data.tar.gz: 2d1f18cacef4dfb0322bb985528c8c1fe23795ff4d5f951cf0ba35a1a87af16a05ebad92ff4efa47bb4a7c8e43c7d36223955454fc82668a6b11230b4e945b0b

data/Rakefile

@@ -18,6 +18,16 @@ require './lib/abiquo-chef-agent.rb'
 require 'rdoc/task'
 require 'rspec/core/rake_task'
 
+desc "Build gem"
+task :build do  
+  system "gem build abiquo-chef-agent.gemspec"
+end
+
+desc "Release to rubygems"
+task :release => :build do
+  system "gem push abiquo-chef-agent-#{Abiquo::Chef::VERSION}"
+end
+
 RSpec::Core::RakeTask.new(:spec)
 
 Rake::RDocTask.new do |rdoc|

data/abiquo-chef-agent.gemspec

@@ -1,6 +1,6 @@
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'abiquo-chef-agent.rb'
+require 'version.rb'
 
 Gem::Specification.new do |gem|
   gem.version         = Abiquo::Chef::VERSION

data/bin/abiquo-chef-run

@@ -78,7 +78,7 @@ end
 log "Parsing leases file"
 leases = Util.parse_leases_file
 if not leases
-  log "Leases file not found or invalid. Current leases search path ['/var/lib/dhcp3', '/var/lib/dhcp', '/var/lib/dhclient'].", :error
+  log "Leases file not found or invalid. Current leases search path ['/var/lib/dhcp3', '/var/lib/dhcp', '/var/lib/dhclient', '/var/lib/NetworkManager'].", :error
   exit 1
 else
   log "Leases found #{leases.inspect}"

data/install/{install-centos.sh → install-centos-6.sh}

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-AGENT_GEM_VERSION=2.0.10
+AGENT_GEM_VERSION=2.0.11
 
 if [[ ${UID} -ne 0 ]]; then
     echo "${0} must be run as root"
@@ -28,7 +28,7 @@ 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 -v ${AGENT_CHEF_VERSION}
+/opt/chef/embedded/bin/gem install abiquo-chef-agent -v ${AGENT_GEM_VERSION}
 
 ln -s /opt/chef/embedded/bin/abiquo-chef-run /usr/bin
 cat > /etc/init.d/abiquo-chef-run << 'EOF'

data/install/install-centos-7.sh

@@ -0,0 +1,66 @@
+#!/bin/bash
+
+# Copyright (C) 2008 Abiquo Holdings S.L.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+AGENT_GEM_VERSION=2.0.11
+
+if [[ ${UID} -ne 0 ]]; then
+    echo "${0} must be run as root"
+    exit 1
+fi
+
+echo "Preparing the system..."
+yum --assumeyes install ntp gcc-c++ libstdc++-devel
+
+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 -v ${AGENT_GEM_VERSION}
+
+ln -s /opt/chef/embedded/bin/abiquo-chef-run /usr/bin
+cat > /lib/systemd/system/abiquo-chef-agent.service << 'EOF'
+[Unit]
+Description=Abiquo Chef Agent
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/abiquo-chef-run
+
+[Install]
+WantedBy=multi-user.target
+EOF
+
+systemctl enable abiquo-chef-agent
+
+echo "Configuring DHCP..."
+read -r -d '' DHCP << 'EOF'
+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;
+EOF
+
+echo "${DHCP}" >/etc/dhcp/dhclient.conf
+
+IFACES=`ip link show | grep ^[0-9]: | grep -iv loopback | cut -d: -f2 | tr -d ' '`
+for IFACE in ${IFACES}; do
+    echo "${DHCP}" >/etc/dhcp/dhclient-${IFACE}.conf
+done
+
+echo "Done!"

data/install/install-ubuntu-systemd.sh

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-AGENT_GEM_VERSION=2.0.10
+AGENT_GEM_VERSION=2.0.11
 
 if [[ `id -u` -ne 0 ]]; then
     echo "${0} must be run with sudo"

data/install/install-ubuntu-upstart.sh

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-AGENT_GEM_VERSION=2.0.10
+AGENT_GEM_VERSION=2.0.11
 
 if [[ `id -u` -ne 0 ]]; then
     echo "${0} must be run with sudo"

data/lib/abiquo-chef-agent.rb

@@ -18,9 +18,6 @@ require 'time'
 
 module Abiquo
   module Chef
-
-    VERSION = '2.0.10'
-
     class Config
       def self.chef_config_dir
         '/etc/chef'
@@ -109,11 +106,11 @@ module Abiquo
       #
       # Tries to find the right leases file
       #
-      def self.find_leases_file(search_dirs = ['/var/lib/dhcp3', '/var/lib/dhcp', '/var/lib/dhclient'])
+      def self.find_leases_file(search_dirs = ['/var/lib/dhcp3', '/var/lib/dhcp', '/var/lib/dhclient', '/var/lib/NetworkManager'])
         leases = []
         search_dirs.each do |d|
           Dir["#{d}/*"].each do |f|
-            next if f !~ /leases$/
+            next if f !~ /lease(s)?$/
             leases << f
           end
         end
@@ -132,7 +129,7 @@ module Abiquo
       #   :abiquo_api_token => token
       # }
       # 
-      def self.parse_leases_file(search_dirs = ['/var/lib/dhcp3', '/var/lib/dhcp', '/var/lib/dhclient'])
+      def self.parse_leases_file(search_dirs = ['/var/lib/dhcp3', '/var/lib/dhcp', '/var/lib/dhclient', '/var/lib/NetworkManager'])
         files = find_leases_file(search_dirs)
         leases = []
         files.each do |file|

data/lib/version.rb

@@ -0,0 +1,5 @@
+module Abiquo
+  module Chef
+    VERSION = '2.0.11'
+  end
+end

data/spec/data/dhclient/dhclient-130c4fe6-30b8-4540-8563-a14e03b683c1-ens3.lease

@@ -0,0 +1,16 @@
+lease {
+  interface "ens3";
+  fixed-address 10.60.13.10;
+  option subnet-mask 255.255.255.0;
+  option routers 10.60.13.1;
+  option dhcp-lease-time 60000;
+  option dhcp-message-type 5;
+  option domain-name-servers 10.60.13.1,8.8.8.8;
+  option dhcp-server-identifier 10.60.20.30;
+  option broadcast-address 10.60.13.255;
+  option vendor-encapsulated-options "http://10.60.20.30:8009/api/cloud/virtualdatacenters/46/virtualappliances/4717/virtualmachines/11851/config/bootstrap@@6Z9u+gUh95DDwTmQbbYKZA==";
+  option domain-name "bcn.abiquo.com.";
+  renew 1 2015/11/30 17:28:04;
+  rebind 2 2015/12/01 00:22:59;
+  expire 2 2015/12/01 02:27:59;
+}

data/spec/unit/util_spec.rb

@@ -27,7 +27,7 @@ describe Util do
     end
 
     it 'should return latest lease' do
-      expect(@leases[:renew]).to eql(Time.parse('2012-11-18 05:48:45 +0100'))
+      expect(@leases[:renew]).to eql(Time.parse('2015/11/30 17:28:04 +0100'))
     end
 
     it 'should  have a valid token' do
@@ -38,7 +38,7 @@ describe Util do
 
   describe 'find_leases_file' do
     it 'should find a lease file' do
-      expect(Util.find_leases_file([data_dir + "dhclient/"])).to have(1).item
+      expect(Util.find_leases_file([data_dir + "dhclient/"])).to have(2).item
     end
 
     it 'should return an empty list' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: abiquo-chef-agent
 version: !ruby/object:Gem::Version
-  version: 2.0.10
+  version: 2.0.11
 platform: ruby
 authors:
 - Salvador Girones
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-27 00:00:00.000000000 Z
+date: 2015-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -111,10 +111,12 @@ files:
 - Rakefile
 - abiquo-chef-agent.gemspec
 - bin/abiquo-chef-run
-- install/install-centos.sh
+- install/install-centos-6.sh
+- install/install-centos-7.sh
 - install/install-ubuntu-systemd.sh
 - install/install-ubuntu-upstart.sh
 - lib/abiquo-chef-agent.rb
+- lib/version.rb
 - spec/data/bootstrap.xml
 - spec/data/bootstrap_empty_cert.xml
 - spec/data/bootstrap_empty_chef.xml
@@ -129,6 +131,7 @@ files:
 - spec/data/bootstrap_missing_server_url.xml
 - spec/data/bootstrap_missing_validation.xml
 - spec/data/bootstrap_no_attributes.xml
+- spec/data/dhclient/dhclient-130c4fe6-30b8-4540-8563-a14e03b683c1-ens3.lease
 - spec/data/dhclient/dhclient.leases
 - spec/data/invalid_bootstrap.xml
 - spec/spec_helper.rb
@@ -174,6 +177,7 @@ test_files:
 - spec/data/bootstrap_missing_server_url.xml
 - spec/data/bootstrap_missing_validation.xml
 - spec/data/bootstrap_no_attributes.xml
+- spec/data/dhclient/dhclient-130c4fe6-30b8-4540-8563-a14e03b683c1-ens3.lease
 - spec/data/dhclient/dhclient.leases
 - spec/data/invalid_bootstrap.xml
 - spec/spec_helper.rb