pec 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40647fc979435e780b1ed75ef3d5d5c69cef8430
-  data.tar.gz: bd561098ca4192c67f9ddb18f2b0f1dd0874ad7d
+  metadata.gz: ff9692ce800f020d84648166b9b0efd0dd706850
+  data.tar.gz: 1bc2f21a9975f5b961e6a7546a1bfc39047b79aa
 SHA512:
-  metadata.gz: caaf7f0b8c4b9f453734816999f23241ed1a319abc73c4c08b9cd545b08176f9fdc4c74aea9f400c07ec91244913ca13b26ef5046b10ee2a3cf2cd72aa5c6cdd
-  data.tar.gz: 2e70c4393bbb7cad5c0ab3b2485ddd78e4e59f7412ab9edeb9465ea51277be691387611937022528fb9f457b2189bb4102ef2873c23e22c7a9cb270c2f156d6a
+  metadata.gz: 516b5d1eb608325daa9896903b29998c8475b69455336bc5872ca67877774a9a7f4b2a2e47c1a6b64535014e55e0b066affbdc703b52840f75a01ded22aeff57
+  data.tar.gz: d279871aacbbde8bdf9f7df4994531c755abca182486e3c8fd55d3cbadfd1e34c5eab43b75514328e0ad06d41b665cf7e5f294fea2ff0445d0787c98b7a2d59f

data/lib/pec/configure/user_data.rb

@@ -28,14 +28,14 @@ module Pec
             ifcfg_content["type"]      = ether.options['type']   ||'Ethernet'
             ifcfg_content["onboot"]    = ether.options['onboot'] || 'yes'
             ifcfg_content["hwaddr"]    = ether.find_port(ports).mac_address
-            path = ether.options['path'] || "/etc/sysconfig/network-scripts/ifcfg-#{ether.name}"
-
             if ether.bootproto == "static"
               ifcfg_content["netmask"] = ether.find_port(ports).netmask
               ifcfg_content["ipaddr"]  = ether.find_port(ports).ip_address
             end
+
             ifcfg_content.merge!(ether.options)
 
+            path = ether.options['path'] || "/etc/sysconfig/network-scripts/ifcfg-#{ether.name}"
             {
               'content' => ifcfg_content.map {|k,v| "#{k.upcase}=#{v}"}.join("\n"),
               'owner' => "root:root",

data/lib/pec/director/helper.rb

@@ -22,8 +22,8 @@ module Pec
           end if host.networks
         end
 
-        def get_nics(ports)
-          { 'nics' =>  ports.map { |port| { port_id: port.id } }}
+        def set_nics(options, ports)
+          ports ? options.merge({ 'nics' =>  ports.map { |port| { port_id: port.id } } }) : options
         end
 
         def get_security_group_id(security_groups)

data/lib/pec/director/make_director.rb

@@ -20,8 +20,7 @@ module Pec
         flavor_ref = Pec::Compute::Flavor.get_ref(host.flavor)
         image_ref  = Pec::Compute::Image.get_ref(host.image)
         options    = { "user_data" => Pec::Configure::UserData.make(host, ports) }
-
-        options.merge!(Pec::Director::Helper.get_nics(ports))
+        options    = Pec::Director::Helper.set_nics(options, ports)
 
         Pec::Compute::Server.create(host.name, image_ref, flavor_ref, options)
       end

data/lib/pec/network/port.rb

@@ -21,14 +21,9 @@ module Pec
           Pec::Network::PortState.new(name, assign_port)
         end
 
-        def get_free_port_ip(ip, subnet)
-          port = fetch_free_port(subnet)
-          port ? IP.new("#{port["fixed_ips"][0]["ip_address"]}/#{ip.pfxlen}") : ip
-        end
-
         def create(ip, subnet, security_group_ids)
-          options = set_security_group(security_group_ids)
-          options = set_fixed_ip(options, subnet, ip)
+          options  = set_security_group(security_group_ids)
+          options  = set_fixed_ip(options, subnet, ip)
           response = Pec::Resource.get.create_port(subnet["network_id"], options)
 
           raise(Pec::Errors::Port, "ip:#{ip.to_addr} is not created!") unless response
@@ -45,6 +40,11 @@ module Pec
           ip.to_s != subnet["cidr"] ? options.merge({ fixed_ips: [{ subnet_id: subnet["id"], ip_address: ip.to_addr}]}) : options
         end
 
+        def get_free_port_ip(ip, subnet)
+          port = fetch_free_port(subnet)
+          port ? IP.new("#{port["fixed_ips"][0]["ip_address"]}/#{ip.pfxlen}") : ip
+        end
+
         def delete(ip)
           target_port = fetch_by_ip(ip.to_addr)
           response = Pec::Resource.get.delete_port(target_port["id"]) if target_port

data/lib/pec/version.rb

@@ -1,3 +1,3 @@
 module Pec
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pec
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - kazuhiko yamashita