kytoon 1.0.0 → 1.0.1

data/CHANGELOG

@@ -0,0 +1,7 @@
+* Mon Jul 23 2012 Dan Prince <dprince@redhat.com> - 1.0.1
+  - Update ServerGroup to call init in all methods. Fixes NilClass errors
+    which can occur if you don't explicitly call 'group::init' in rake tasks.
+  - XenServer: Automatically add IP to bridge.
+
+* Sun Jul 22 2012 Dan Prince <dprince@redhat.com> - 1.0.0
+  - Initial release. Based on Chef VCP Toolkit.

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/lib/kytoon/providers/xenserver/server_group.rb

@@ -1,9 +1,8 @@
 require 'json'
-require 'builder'
 require 'fileutils'
-require 'rexml/document'
 require 'kytoon/util'
 require 'base64'
+require 'ipaddr'
 
 module Kytoon
 
@@ -229,18 +228,30 @@ fi
 
   def self.init_host(sg)
 
+    cidr = IPAddr.new(sg.netmask).to_i.to_s(2).count("1")
+
     hosts_file_data = "127.0.0.1\tlocalhost localhost.localdomain\n"
     sg.servers.each do |server|
       hosts_file_data += "#{server['ip_address']}\t#{server['hostname']}\n"
     end
 
     Kytoon::Util.remote_exec(%{
+# Add first IP to bridge
+if ! ip a | grep #{sg.gateway}/#{cidr} | grep #{sg.bridge}; then
+  ip a add #{sg.gateway}/#{cidr} dev #{sg.bridge}
+fi
+
 cat > /etc/hosts <<-EOF_CAT
 #{hosts_file_data}
 EOF_CAT
 # FIXME... probably a bit insecure but most people are probably using
 # boxes behind another firewall anyway.
 iptables -F
+iptables -X
+iptables -t nat -F
+iptables -t nat -X
+iptables -t mangle -F
+iptables -t mangle -X
 iptables -P INPUT ACCEPT
 iptables -P FORWARD ACCEPT
 iptables -P OUTPUT ACCEPT

data/lib/kytoon/server_group.rb

@@ -20,10 +20,12 @@ class ServerGroup
   end
 
   def self.index(options)
+    self.init
     @@group_class.index(options)
   end
 
   def self.create
+    self.init
     json_config_file=ENV['SERVER_GROUP_JSON']
     if json_config_file.nil? then
       json_config_file = @@group_class::CONFIG_FILE
@@ -33,11 +35,13 @@ class ServerGroup
   end
 
   def self.get
+    self.init
     id = ENV['GROUP_ID']
     @@group_class.get(:id => id)
   end
 
   def self.delete
+    self.init
     id = ENV['GROUP_ID']
     sg = @@group_class.get(:id => id)
     sg.delete

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kytoon
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-23 00:00:00.000000000 Z
+date: 2012-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -181,6 +181,7 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - .document
+- CHANGELOG
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -231,7 +232,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1256682396353941801
+      hash: -3839529806492560210
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: