xp5k 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64a41367917d4c9b4445f795f9d71eb1a092b901
-  data.tar.gz: 26ea5183d5e2e675bccdb938443d2e464efbeda6
+  metadata.gz: 17334721e7c45832785d2e615c822b081cb14d2b
+  data.tar.gz: 2ab5ac52522dd716279c65cb27448e539d697e3f
 SHA512:
-  metadata.gz: a4e3e3c59d52bf281a1e0c8a55f328c5e7ecc4fd4791d63aff1e5a099255c46f11fbdb2267861ccde607a5ea7467d0d55de1d37d542c592ecb0822e34214903d
-  data.tar.gz: 84348914d0e589ef7859de46a980806b98a0067fcef293e5290aa8f8d67b6bb7c53b7b6d8f29e62235bf7c3d449c210bef4e08deda64b04a8409ef93daa4bf5b
+  metadata.gz: a62ab77e00dd13ad9d733142ac930462281dadd7bf49f42132553e6f3079204fe90db14d3255a71e0ea0f826c0ff447942d5675013ae999b5af8c9053ee14673
+  data.tar.gz: 6ebbffd6a1b21d621ae59f7219747fa46face90368b15189e7a03433bda024e0b2976aa77ecba5ab9a73c1acb1553bba8a1688567fcc37cf9607bec9975326bd

data/lib/xp5k/rake/dsl.rb

@@ -26,7 +26,13 @@ module XP5K
           end
         end
 
-        XP5K::Role.new(name: args.first, size: hosts.length, servers: hosts, proc: procblock).add
+        if not existing_role = XP5K::Role.findByName(args.first)
+          XP5K::Role.new(name: args.first, size: hosts.length, servers: hosts, proc: procblock).add
+        else
+          existing_role.size = hosts.length
+          existing_role.servers = hosts
+          existing_role.proc = procblock
+        end
 
       end
 
@@ -56,6 +62,10 @@ module XP5K
         commands = (args.last.class == String or args.last.class == Array) ? (args.last.class == String ? [args.pop] : args.pop ) : []
         options = args.last.class == Hash ? args.pop : {}
         options[:user] ||= 'root'
+        options[:environment] ||= {}
+        cmd_env = options[:environment].map do |key, value|
+          "#{key}=#{value}"
+        end
 
         if block_given?
           case result = yield
@@ -111,6 +121,7 @@ module XP5K
               while host = workq.pop(true)
                 begin
                   commands.each do |command|
+                    command.prepend(cmd_env.join(' ') + ' ') unless cmd_env.empty?
                     puts "[command][#{host}] #{command}"
                     ssh_session[host].exec!(command) do |channel, stream, data|
                       logs[host] << data

data/lib/xp5k/role.rb

@@ -1,6 +1,6 @@
 class XP5K::Role
 
-  attr_accessor :name, :size, :desc, :servers, :jobid, :inner, :pattern, :proc
+  attr_accessor :name, :size, :desc, :servers, :jobid, :inner, :pattern, :proc, :vlan
 
   @@roles = []
 
@@ -10,6 +10,7 @@ class XP5K::Role
     @servers = []
     @desc    = ""
     @proc    = nil
+    @vlan    = nil
 
     # Required parameters
     %w{ name size }.each do |param|
@@ -21,7 +22,7 @@ class XP5K::Role
     end
 
     # Optional parameters
-    %w{ desc servers inner pattern proc }.each do |param|
+    %w{ desc servers inner pattern proc vlan }.each do |param|
       instance_variable_set("@#{param}", options[param.to_sym]) if options[param.to_sym]
     end
   end
@@ -34,7 +35,13 @@ class XP5K::Role
     if self.proc.class == Proc
       self.callproc
     end
-    @servers
+    if @vlan
+      @servers.map do |node|
+        node.match('kavlan') ? node : node.gsub(/-(\d+)/, '-\1-kavlan-' + @vlan)
+      end
+    else
+      @servers
+    end
   end
 
   def callproc

data/lib/xp5k/version.rb

@@ -1,3 +1,3 @@
 module XP5K
-  VERSION='0.0.11'
+  VERSION='0.0.12'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xp5k
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Pascal Morillon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-05 00:00:00.000000000 Z
+date: 2015-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client