pec 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de4afe55b26feafd85e2735f85bfd4bcf7cfd765
-  data.tar.gz: c0bc229e8eb45d455d0a724aab16d0b360258a2d
+  metadata.gz: 392f342e2b27871767f7fe5948146787f87980a0
+  data.tar.gz: baf04990a37528b744de4c363dab705d10148148
 SHA512:
-  metadata.gz: 397bde231b31ac5ea69cddacb767b4dfd05cfc9d6532ea58e98ce42b7c0b25d29ef55f854715fbd1ce018958f05e6d603528b0d6127b7b5e6fcd9adef67fb65d
-  data.tar.gz: 18c9cd6461af6ed0f80841bf8e07bb5165479c52a0c8098ab57326a81c7c9a4f2ac1f49e37982a6cd9fe32b9131f45ec19619b767b0209d0aded1fc73c103a15
+  metadata.gz: eeb3951cf5e8aa8842f4a7c781b84146703c97b96f28ded998129ab7d3fbb1a5a916e2f8d0e13998d26aa8310c9d3a50f7e7906705fe68de8875102ae60decde
+  data.tar.gz: 0f1f0ab20596024f81aa30acb57c898ae8e6d2871e4221c63ea39b26630528bfb54414260a45ef1399a79ff1387b67a9ab54d4f8b0c2882792189a115de5e31d

data/README.md

@@ -31,6 +31,7 @@ create - /user_data/web_server.yaml.sample
 ```
 # merge of yaml
 _default_: &def
+  os_type: centos
   tenant: your_tenant
   image: centos-7.1_chef-12.3_puppet-3.7
   flavor: m1.small
@@ -78,6 +79,7 @@ inludes:
 | tenant            |    ○    | your_tenant                     |
 | image             |    ○    | centos-7.1_chef-12.3_puppet-3.7 |
 | flavor            |    ○    | m1.small                        |
+| os_type           |    -    | centos(centos or ubuntu         |
 | networks          |    -    | []                              |
 | security_group    |    -    | [default,ssh]                   |
 | templates         |    -    | [base.yaml,webserver.yaml]      |
@@ -95,6 +97,7 @@ inludes:
 | allowed_address_pairs |         | [10.1.1.2/24]                                              |
 
 ※ bootproto=static is required
+
 Items other than the above are output to the configuration file with `KEY = value` format
 
 #### Includes

data/lib/pec.rb

@@ -9,6 +9,7 @@ require "pec/version"
 require "pec/logger"
 require "pec/configure"
 require "pec/handler"
+require "pec/coordinate"
 require "pec/command"
 require "pec/sample"
 require "pec/init"
@@ -56,7 +57,6 @@ module Pec
     end
   end
 
-
   def self.check_env
     %w(
       OS_AUTH_URL
@@ -66,6 +66,10 @@ module Pec
       raise "please set env #{name}" unless ENV[name]
     end
   end
+
+  def self.config_reset
+    @_configure = nil
+  end
 end
 
 class ::Hash

data/lib/pec/command/up.rb

@@ -6,14 +6,13 @@ module Pec::Command
         Pec::Logger.info "make start #{config.name}"
 
         attribute = {name: config.name}
-        config.keys.each do |k|
-          Pec::Handler.constants.each do |c|
-            _handler = Object.const_get("Pec::Handler::#{c}")
-            attribute.deep_merge!(_handler.build(config)) if _handler.kind == k
-          end
+        make_attribute(config, Pec::Handler) do |key, klass|
+          attribute.deep_merge!(klass.build(config))
         end
 
-        attribute[:user_data] = Base64.encode64("#cloud-config\n" + attribute[:user_data].to_yaml) if attribute[:user_data]
+        make_attribute(attribute, Pec::Coordinate) do |key, klass|
+          attribute.deep_merge!(klass.build(config, attribute))
+        end
 
         Yao::Server.create(attribute)
         Pec::Logger.info "create success! #{config.name}"
@@ -21,5 +20,14 @@ module Pec::Command
         Pec::Logger.notice "already server: #{config.name}"
       end
     end
+
+    def self.make_attribute(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
+        end
+      end
+    end
   end
 end

data/lib/pec/coordinate.rb

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

data/lib/pec/coordinate/base.rb

@@ -0,0 +1,10 @@
+module Pec::Coordinate
+  class Base
+    class << self
+      attr_accessor :kind
+      def build(host, attribute)
+        raise "not defined method"
+      end
+    end
+  end
+end

data/lib/pec/coordinate/user_data.rb

@@ -0,0 +1,21 @@
+module Pec::Coordinate
+  class UserData < Base
+    autoload :Base, "pec/coordinate/user_data/base"
+    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

data/lib/pec/coordinate/user_data/base.rb

@@ -0,0 +1,10 @@
+module Pec::Coordinate
+  class UserData::Base
+    class << self
+      attr_accessor :kind
+      def build
+        raise "undefine method build"
+      end
+    end
+  end
+end

data/lib/pec/coordinate/user_data/nic.rb

@@ -0,0 +1,43 @@
+module Pec::Coordinate
+  class UserData::Nic < Base
+    autoload :Base,   "pec/coordinate/user_data/nic/base"
+    autoload :Rhel,   "pec/coordinate/user_data/nic/rhel"
+    autoload :Ubuntu, "pec/coordinate/user_data/nic/ubuntu"
+    self.kind = 'networks'
+
+    class << self
+      NAME = 0
+      CONFIG = 1
+      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)
+        end
+
+        nic = if _nic
+          Object.const_get("Pec::Coordinate::UserData::Nic::#{_nic}")
+        else
+          Pec::Coordinate::UserData::Nic::Rhel
+        end
+
+        attribute.deep_merge(
+          {
+            user_data: {
+              "write_files" => nic.gen_user_data(host.networks, ports(attribute))
+            }
+          }
+        )
+      end
+
+      def ports(attribute)
+        port_ids(attribute).map do |id|
+          Yao::Port.get(id)
+        end
+      end
+
+      def port_ids(attribute)
+        attribute[:networks].map {|n|n[:port]}
+      end
+
+    end
+  end
+end

data/lib/pec/coordinate/user_data/nic/base.rb

@@ -0,0 +1,39 @@
+module Pec::Coordinate
+  class UserData::Nic::Base
+    class << self
+      NAME = 0
+      CONFIG = 1
+      attr_accessor :os_type
+      def gen_user_data(networks, ports)
+        networks.map do |network|
+          port = ports.find {|p|p.name == network[NAME]}
+          path = network[CONFIG]['path'] || default_path(port)
+          {
+            'content' => ifcfg_config(network, port),
+            'owner' => "root:root",
+            'path' => path,
+            'permissions' => "0644"
+          }
+        end
+      end
+
+      def safe_merge(base, network)
+        # delete option column
+        mask_column = Pec::Handler::Networks.constants.map {|c| Object.const_get("Pec::Handler::Networks::#{c}").kind }
+        mask_config = network[CONFIG].reject {|k,v| mask_column.include?(k)}
+
+        base.merge(
+          mask_config
+        )
+      end
+
+      def default_path(port)
+        raise "undfined method default_path"
+      end
+
+      def ifcfg_config(network, port)
+        raise "undfined method ifcfg_config"
+      end
+    end
+  end
+end

data/lib/pec/coordinate/user_data/nic/rhel.rb

@@ -0,0 +1,29 @@
+module Pec::Coordinate
+  class UserData::Nic
+    class Rhel < Base
+      self.os_type = %w(centos rhel)
+      class << self
+        def ifcfg_config(network, port)
+          base = {
+            "name"      => port.name,
+            "device"    => port.name,
+            "type"      => 'Ethernet',
+            "onboot"    => 'yes',
+            "hwaddr"    => port.mac_address
+          }
+          base.merge!(
+            {
+              "netmask" => IP.new(network[CONFIG]['ip_address']).netmask.to_s,
+              "ipaddr"  => port.fixed_ips.first['ip_address']
+            }
+          ) if network[CONFIG]['bootproto'] == "static"
+          safe_merge(base, network).map {|k,v| "#{k.upcase}=#{v}"}.join("\n")
+        end
+
+        def default_path(port)
+          "/etc/sysconfig/network-scripts/ifcfg-#{port.name}"
+        end
+      end
+    end
+  end
+end

data/lib/pec/coordinate/user_data/nic/ubuntu.rb

@@ -0,0 +1,46 @@
+module Pec::Coordinate
+  class UserData::Nic
+    class Ubuntu < Base
+      self.os_type = %w(ubuntu)
+      class << self
+        def gen_user_data(networks, ports)
+          port_content = [
+            "auto lo\niface lo inet loopback"
+          ]
+
+          networks.map do |network|
+            port = ports.find {|p|p.name == network[NAME]}
+            port_content << ifcfg_config(network, port)
+          end
+          [
+            {
+              'content' => port_content.join("\n"),
+              'owner' => "root:root",
+              'path' => networks.first[CONFIG]['path'] || default_path(nil),
+              'permissions' => "0644"
+            }
+          ]
+        end
+
+        def ifcfg_config(network, port)
+          base = {
+            "auto"                    => port.name,
+            "iface #{port.name} inet" => network[CONFIG]['bootproto'],
+          }
+          base.merge!(
+            {
+              "address"  => port.fixed_ips.first['ip_address'],
+              "netmask" => IP.new(network[CONFIG]['ip_address']).netmask.to_s,
+              "hwaddress ether"  => port.mac_address
+            }
+          ) if network[CONFIG]['bootproto'] == "static"
+          safe_merge(base, network).reject {|k,v| k == "bootproto"}.map {|k,v| "#{k} #{v}"}.join("\n")
+        end
+
+        def default_path(port)
+          "/etc/network/interfaces"
+        end
+      end
+    end
+  end
+end

data/lib/pec/handler/networks.rb

@@ -11,21 +11,15 @@ module Pec::Handler
 
       def build(host)
         ports = []
-        user_data = []
-
         host.networks.each do |network|
           validate(network)
           Pec::Logger.notice "port create start : #{network[NAME]}"
           port = create_port(host, network)
           Pec::Logger.notice "assgin ip : #{port.fixed_ips.first["ip_address"]}"
           ports << port
-          user_data << gen_user_data(network, port)
         end
         {
-          networks: ports.map {|port| { uuid: nil, port: port.id }},
-          user_data: {
-            'write_files' => user_data
-          }
+          networks: ports.map {|port| { uuid: nil, port: port.id }}
         }
       end
 
@@ -67,41 +61,6 @@ module Pec::Handler
         attribute
       end
 
-      def gen_user_data(network, port)
-        path = network[CONFIG]['path'] || "/etc/sysconfig/network-scripts/ifcfg-#{port.name}"
-        {
-          'content' => ifcfg_config(network, port),
-          'owner' => "root:root",
-          'path' => path,
-          'permissions' => "0644"
-        }
-      end
-
-      def ifcfg_config(network, port)
-        base = {
-          "name"      => port.name,
-          "device"    => port.name,
-          "type"      => 'Ethernet',
-          "onboot"    => 'yes',
-          "hwaddr"    => port.mac_address
-        }
-        base.merge!(
-          {
-            "netmask" => IP.new(network[CONFIG]['ip_address']).netmask.to_s,
-            "ipaddr"  => port.fixed_ips.first['ip_address']
-          }
-        ) if network[CONFIG]['bootproto'] == "static"
-
-        # delete option column
-        mask_column = Pec::Handler::Networks.constants.map {|c| Object.const_get("Pec::Handler::Networks::#{c}").kind }
-        mask_config = network[CONFIG].select {|k,v| !mask_column.include?(k)}
-
-        base.merge!(
-          mask_config
-        )
-        base.map {|k,v| "#{k.upcase}=#{v}"}.join("\n")
-      end
-
       def security_group(host)
         tenant = Yao::Tenant.list.find {|t| t.name == host.tenant }
         ids = host.security_group.map do |name|

data/lib/pec/version.rb

@@ -1,3 +1,3 @@
 module Pec
-  VERSION = "0.7.3"
+  VERSION = "0.7.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pec
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - kazuhiko yamashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-29 00:00:00.000000000 Z
+date: 2015-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -152,6 +152,14 @@ files:
 - lib/pec/command/up.rb
 - lib/pec/config_error.rb
 - lib/pec/configure.rb
+- lib/pec/coordinate.rb
+- lib/pec/coordinate/base.rb
+- lib/pec/coordinate/user_data.rb
+- lib/pec/coordinate/user_data/base.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/handler.rb
 - lib/pec/handler/availability_zone.rb
 - lib/pec/handler/base.rb