pec 0.7.8 → 0.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a615c6aea01b3e516f72fc1806e0915730ec4a8
-  data.tar.gz: 45adb312f61ef71c5206bb00b2ebca11d6d563ef
+  metadata.gz: 6e289abbff98834305ea24c1bb20d3858d548fc9
+  data.tar.gz: 6a1187c24347f8783d03f84179c543a317a46b8c
 SHA512:
-  metadata.gz: 124c0ca363138d554dcad5fad3248574025c85c96cd1d4ae579481799443fd152e392053deb54c6f288d56f245c5ef26358d9b7f96e72570e7c6adaee16b82da
-  data.tar.gz: fc002a6b3b3d6bef233c4638aedc420c793471ac6f21f1000a4f32c9626c6b5589b7b97f2a6f692bcd745d1cbe986034a42fed689057a06eb84372240b088d9a
+  metadata.gz: 7e51d042af1b21821fd38a505d01ad2c82b9e970866b284dd0479f020bc54616b08656883788c0c38b97e2928e73169e4287830a80e6f1133e8ac35b30b3e31b
+  data.tar.gz: 9ae349b52e0cb7cc154cabb69c40dbda8a406f9ab2e44eb98a52bd9d65025e3a376c339b59999e97c46960818877a297344647f7940c792581c096d9cf26c688

data/lib/pec.rb

@@ -10,7 +10,6 @@ require "pec/version"
 require "pec/logger"
 require "pec/configure"
 require "pec/handler"
-require "pec/coordinate"
 require "pec/command"
 require "pec/sample"
 require "pec/init"

data/lib/pec/command/up.rb

@@ -5,18 +5,29 @@ module Pec::Command
       case
       when server.nil?
         Pec::Logger.info "make start #{config.name}"
-
         attribute = {name: config.name}
-        make_attribute(config, Pec::Handler) do |key, klass|
-          attribute.deep_merge!(klass.build(config))
-        end
 
-        make_attribute(attribute, Pec::Coordinate) do |key, klass|
-          attribute.deep_merge!(klass.build(config, attribute))
+        begin
+          processor_matching(config, Pec::Handler) do |klass|
+            attribute.deep_merge!(klass.build(config))
+          end
+
+          processor_matching(attribute, Pec::Handler) do |klass|
+            attribute.deep_merge!(klass.post_build(config, attribute))
+          end
+
+          Yao::Server.create(attribute)
+          Pec::Logger.info "create success! #{config.name}"
+        rescue => e
+          Pec::Logger.critical(e)
+          Pec::Logger.warning "recovery start #{config.name}"
+
+          processor_matching(config, Pec::Handler) do |klass|
+            attribute.deep_merge!(klass.recover(attribute))
+          end
+          Pec::Logger.warning "recovery success! #{config.name}"
         end
 
-        Yao::Server.create(attribute)
-        Pec::Logger.info "create success! #{config.name}"
       when server.status == "SHUTOFF"
         Yao::Server.start(server.id)
         Pec::Logger.info "start server: #{config.name}"
@@ -25,11 +36,11 @@ module Pec::Command
       end
     end
 
-    def self.make_attribute(source, klass)
+    def self.processor_matching(source, klass)
       source.keys.each do |k|
         Object.const_get(klass.to_s).constants.each do |c|
           object = Object.const_get("#{klass.to_s}::#{c}")
-          yield k, object if  k.to_s == object.kind.to_s
+          yield object if  k.to_s == object.kind.to_s
         end
       end
     end

data/lib/pec/core.rb

@@ -4,5 +4,9 @@ module Pec
     def build(*args)
       raise "#{self.class.name} not defined method build"
     end
+
+    def post_build(*args); end
+
+    def recover(*args); end
   end
 end

data/lib/pec/handler/networks.rb

@@ -23,6 +23,15 @@ module Pec::Handler
         }
       end
 
+      def recover(attribute)
+        Pec::Logger.notice "start port recovery"
+        attribute[:networks].each do |port|
+          Yao::Port.destroy(port[:port])
+          Pec::Logger.notice "port delete id:#{port[:port]}"
+        end
+        Pec::Logger.notice "complete port recovery"
+      end
+
       def validate(network)
         %w(
           bootproto

data/lib/pec/handler/user_data.rb

@@ -1,14 +1,27 @@
 module Pec::Handler
   class UserData
     extend Pec::Core
+    autoload :Nic,  "pec/handler/user_data/nic"
     self.kind = 'user_data'
-    class << self
-      def build(host) 
-        user_data = host.user_data || {}
-        user_data['fqdn'] = host.name if host.user_data && !host.user_data['fqdn'] 
-        { user_data: user_data }
+
+    def self.build(host)
+      user_data = host.user_data || {}
+      user_data['fqdn'] = host.name if host.user_data && !host.user_data['fqdn']  
+      { user_data: user_data }
+    end
+
+    def self.post_build(host, attribute)
+      attribute.keys.each do |k|
+        Pec::Handler::UserData.constants.each do |c|
+          klass = Object.const_get("Pec::Handler::UserData::#{c}")
+
+          if klass.kind.to_s == k.to_s
+            attribute = klass.post_build(host, attribute)
+          end
+        end
       end
+      attribute[:user_data] = Base64.encode64("#cloud-config\n" + attribute[:user_data].to_yaml) if attribute[:user_data]
+      attribute
     end
   end
 end
-

data/lib/pec/{coordinate → handler}/user_data/nic.rb

@@ -1,21 +1,21 @@
-module Pec::Coordinate
+module Pec::Handler
   class UserData::Nic
     extend Pec::Core
-    autoload :Base,   "pec/coordinate/user_data/nic/base"
-    autoload :Rhel,   "pec/coordinate/user_data/nic/rhel"
-    autoload :Ubuntu, "pec/coordinate/user_data/nic/ubuntu"
+    autoload :Base,   "pec/handler/user_data/nic/base"
+    autoload :Rhel,   "pec/handler/user_data/nic/rhel"
+    autoload :Ubuntu, "pec/handler/user_data/nic/ubuntu"
     self.kind = 'networks'
 
     class << self
-      def build(host, attribute)
-        _nic = Pec::Coordinate::UserData::Nic.constants.reject {|c|c.to_s.downcase == "base"}.find do |c|
-          host.os_type && Object.const_get("Pec::Coordinate::UserData::Nic::#{c}").os_type.include?(host.os_type)
+      def post_build(host, attribute)
+        _nic = Pec::Handler::UserData::Nic.constants.reject {|c|c.to_s.downcase == "base"}.find do |c|
+          host.os_type && Object.const_get("Pec::Handler::UserData::Nic::#{c}").os_type.include?(host.os_type)
         end
 
         nic = if _nic
-          Object.const_get("Pec::Coordinate::UserData::Nic::#{_nic}")
+          Object.const_get("Pec::Handler::UserData::Nic::#{_nic}")
         else
-          Pec::Coordinate::UserData::Nic::Rhel
+          Pec::Handler::UserData::Nic::Rhel
         end
 
         attribute.deep_merge(

data/lib/pec/{coordinate → handler}/user_data/nic/base.rb

@@ -1,4 +1,4 @@
-module Pec::Coordinate
+module Pec::Handler
   class UserData::Nic::Base
     class << self
       NAME = 0

data/lib/pec/{coordinate → handler}/user_data/nic/rhel.rb

@@ -1,4 +1,4 @@
-module Pec::Coordinate
+module Pec::Handler
   class UserData::Nic
     class Rhel < Base
       self.os_type = %w(centos rhel)

data/lib/pec/{coordinate → handler}/user_data/nic/ubuntu.rb

@@ -1,4 +1,4 @@
-module Pec::Coordinate
+module Pec::Handler
   class UserData::Nic
     class Ubuntu < Base
       self.os_type = %w(ubuntu)

data/lib/pec/version.rb

@@ -1,3 +1,3 @@
 module Pec
-  VERSION = "0.7.8"
+  VERSION = "0.7.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pec
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.7.9
 platform: ruby
 authors:
 - kazuhiko yamashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-17 00:00:00.000000000 Z
+date: 2015-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -153,12 +153,6 @@ files:
 - lib/pec/command/up.rb
 - lib/pec/config_error.rb
 - lib/pec/configure.rb
-- lib/pec/coordinate.rb
-- lib/pec/coordinate/user_data.rb
-- lib/pec/coordinate/user_data/nic.rb
-- lib/pec/coordinate/user_data/nic/base.rb
-- lib/pec/coordinate/user_data/nic/rhel.rb
-- lib/pec/coordinate/user_data/nic/ubuntu.rb
 - lib/pec/core.rb
 - lib/pec/handler.rb
 - lib/pec/handler/availability_zone.rb
@@ -170,6 +164,10 @@ files:
 - lib/pec/handler/networks/ip_address.rb
 - lib/pec/handler/templates.rb
 - lib/pec/handler/user_data.rb
+- lib/pec/handler/user_data/nic.rb
+- lib/pec/handler/user_data/nic/base.rb
+- lib/pec/handler/user_data/nic/rhel.rb
+- lib/pec/handler/user_data/nic/ubuntu.rb
 - lib/pec/init.rb
 - lib/pec/logger.rb
 - lib/pec/sample.rb

data/lib/pec/coordinate.rb

@@ -1,5 +0,0 @@
-module Pec
-  module Coordinate
-    autoload :UserData, "pec/coordinate/user_data"
-  end
-end

data/lib/pec/coordinate/user_data.rb

@@ -1,21 +0,0 @@
-module Pec::Coordinate
-  class UserData
-    extend Pec::Core
-    autoload :Nic,  "pec/coordinate/user_data/nic"
-    self.kind = 'user_data'
-
-    def self.build(host, attribute)
-      attribute.keys.each do |k|
-        Pec::Coordinate::UserData.constants.each do |c|
-          klass = Object.const_get("Pec::Coordinate::UserData::#{c}")
-
-          if klass.kind.to_s == k.to_s
-            attribute = klass.build(host, attribute)
-          end
-        end
-      end
-      attribute[:user_data] = Base64.encode64("#cloud-config\n" + attribute[:user_data].to_yaml) if attribute[:user_data]
-      attribute
-    end
-  end
-end