sakurraform 0.4.0 → 0.4.1.dev

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3cce78309426bf6755b1fbf2d3cfca419611c7a
-  data.tar.gz: eea0d179c2a9f170c40ad87b8be7f0f221fbc76a
+  metadata.gz: 438da9159bf1065cf6e482ae108b7d2c016072e6
+  data.tar.gz: d67ea9981d097fd0caa9153d7f3cb3b6511ba242
 SHA512:
-  metadata.gz: 17348e6c25ad8d48838ef40361c5724dc59283da47a23f77da8af73210106a54615c9b5c093333e6532b09d11132e446e467c5624f85df54ddb38595fded94b8
-  data.tar.gz: 8f856f4d79dbf7420a690786359c570ff7213d2eaaad2e0c1792e67040da569293ac1cdbe835dd9d18be61066216b902aaf82751ca7f7a923ba2da1524236842
+  metadata.gz: cdefbd6bd789eb2e878149e047479c991c0e7eb58b9c3df6e90fd13dde33c1ab4e8bce42ad476535b5d3082ec13830c1255e6e8318f6f3632b8e860e0b142240
+  data.tar.gz: 7362c603bc1a1d0503161c1270ee7a90147dc9a901de1cdd2ecefa9c032b515d5d456a5eb48699b8953d0d03d42014a0a5449398c2540d03f0ca9746057e3498

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Not release or WIP
 
+- Cleanup configuration of resource. (use first by default)
+
+## v0.4.1
+
+- Set hostname from name
+
 ## v0.4.0
 
 - Support Simple L2 Switch

data/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
-gem 'fog-sakuracloud', path: '../../fog/fog-sakuracloud/'
 
 gemspec

data/README.md

@@ -7,7 +7,6 @@ Manage Infrastructure from Code with Sakura no Cloud and Object Storage.
 
 ## TODO
 
-- delete resources.
 - update resources if detect diff.
 
 
@@ -122,17 +121,17 @@ $ ./bin/sakurraform status
   +----------------+-----------------------------------------------------+--------------+--------------------+-----------------+
   | defaultrouter  | defaultrouter-d9805cd0-295c-0132-62c1-38e8563c85ec  | 112600778154 | 133.242.242.192/28 | 133.242.242.193 |
   +----------------+-----------------------------------------------------+--------------+--------------------+-----------------+
-  | defaultrouter2 | defaultrouter2-e2368190-295c-0132-62c1-38e8563c85ec | 112600778157 | 133.242.242.208/28 | 133.242.242.209 |
+  | localswitch1   | localswitch1-e2368190-295c-0132-62c1-38e8563c85ec   | 112600778157 |                    |                 |
   +----------------+-----------------------------------------------------+--------------+--------------------+-----------------+
 
   Server resources
-  +---------+----------------------------------------------+--------------+-----------------+--------+---------------------------+
-  | name    | sakurraform_name                             | sakura_id    | ipaddress       | status | last_state_changed        |
-  +---------+----------------------------------------------+--------------+-----------------+--------+---------------------------+
-  | server1 | server1-ed6ea720-295c-0132-62c1-38e8563c85ec | 112600778159 | 133.242.242.194 | up     | 2014-09-29T01:47:57+09:00 |
-  +---------+----------------------------------------------+--------------+-----------------+--------+---------------------------+
-  | server2 | server2-1f9f9b40-295d-0132-62c1-38e8563c85ec | 112600778162 | 133.242.242.195 | up     | 2014-09-29T01:49:22+09:00 |
-  +---------+----------------------------------------------+--------------+-----------------+--------+---------------------------+
+  +---------+----------------------------------------------+--------------+-----------------+----------------------------------+--------+---------------------------+
+  | name    | sakurraform_name                             | sakura_id    | ipaddress       | network                          | status | last_state_changed        |
+  +---------+----------------------------------------------+--------------+-----------------+----------------------------------+--------+---------------------------+
+  | server1 | server1-ed6ea720-295c-0132-62c1-38e8563c85ec | 112600778159 | 133.242.242.194 | ["112600778154", "112600778157"] | up     | 2014-09-29T01:47:57+09:00 |
+  +---------+----------------------------------------------+--------------+-----------------+----------------------------------+--------+---------------------------+
+  | server2 | server2-1f9f9b40-295d-0132-62c1-38e8563c85ec | 112600778162 | 133.242.242.195 | ["112600778154", "112600778157"] | up     | 2014-09-29T01:49:22+09:00 |
+  +---------+----------------------------------------------+--------------+-----------------+----------------------------------+--------+---------------------------+
 
 ```
 
@@ -150,17 +149,17 @@ $ sakurraform plan destroy
   +---------------+----------------------------------------------------+--------------+--------------------+-----------------+
 
   Server resources
-  +----------+-----------------------------------------------+--------------+-----------------+--------+---------------------------+
-  | name     | sakurraform_name                              | sakura_id    | ipaddress       | status | last_state_changed        |
-  +----------+-----------------------------------------------+--------------+-----------------+--------+---------------------------+
-  | master   | master-3e88cfc0-38ed-0133-a63c-38e8563c85ec   | 112700768736 | 153.120.161.244 | up     | 2015-09-09T15:54:35+09:00 |
-  +----------+-----------------------------------------------+--------------+-----------------+--------+---------------------------+
-  | minion-1 | minion-1-8e060590-38ed-0133-a63c-38e8563c85ec | 112700768742 | 153.120.161.245 | up     | 2015-09-09T15:57:53+09:00 |
-  +----------+-----------------------------------------------+--------------+-----------------+--------+---------------------------+
-  | minion-2 | minion-2-0420bc90-38ee-0133-a63c-38e8563c85ec | 112700768750 | 153.120.161.246 | up     | 2015-09-09T16:01:46+09:00 |
-  +----------+-----------------------------------------------+--------------+-----------------+--------+---------------------------+
-  | minion-3 | minion-3-8f796470-38ee-0133-a63c-38e8563c85ec | 112700768763 | 153.120.161.247 | up     | 2015-09-09T16:05:01+09:00 |
-  +----------+-----------------------------------------------+--------------+-----------------+--------+---------------------------+
+  +----------+-----------------------------------------------+--------------+-----------------+------------------+------------------------------------+
+  | name     | sakurraform_name                              | sakura_id    | ipaddress       | network          | status | last_state_changed        |
+  +----------+-----------------------------------------------+--------------+-----------------+------------------+------------------------------------+
+  | master   | master-3e88cfc0-38ed-0133-a63c-38e8563c85ec   | 112700768736 | 153.120.161.244 | ["112700768733"] | up     | 2015-09-09T15:54:35+09:00 |
+  +----------+-----------------------------------------------+--------------+-----------------+------------------+------------------------------------+
+  | minion-1 | minion-1-8e060590-38ed-0133-a63c-38e8563c85ec | 112700768742 | 153.120.161.245 | ["112700768733"] | up     | 2015-09-09T15:57:53+09:00 |
+  +----------+-----------------------------------------------+--------------+-----------------+---------------------------+---------------------------+
+  | minion-2 | minion-2-0420bc90-38ee-0133-a63c-38e8563c85ec | 112700768750 | 153.120.161.246 | ["112700768733"] | up     | 2015-09-09T16:01:46+09:00 |
+  +----------+-----------------------------------------------+--------------+-----------------+------------------+------------------------------------+
+  | minion-3 | minion-3-8f796470-38ee-0133-a63c-38e8563c85ec | 112700768763 | 153.120.161.247 | ["112700768733"] | up     | 2015-09-09T16:05:01+09:00 |
+  +----------+-----------------------------------------------+--------------+-----------------+---------------------------+---------------------------+
 This operation removes all resources from Sakura no Cloud.
 Are you sure (Type 'Yes')?  Yes
 Send stop to master-3e88cfc0-38ed-0133-a63c-38e8563c85ec

data/lib/sakurraform/cli/plan.rb

@@ -26,7 +26,7 @@ module SakurraForm
       col_networks.resources.each do |net|
         unless net.resource_id
           net.resource_id = name_plus_uuid(net.name)
-          options = net.configuration.first.merge({'name' => net.resource_id})
+          options = net.configuration.merge({'name' => net.resource_id})
           say("Create new #{net.mode} #{net.name}")
           case net.mode
           when 'router'
@@ -54,8 +54,8 @@ module SakurraForm
       col_servers.resources.each do |sv|
         unless sv.resource_id
           sv.resource_id = name_plus_uuid(sv.name)
-          switch_id = resolve_sakura_id_by_combined(sv.configuration.first["switch"])
-          options = sv.configuration.first.merge(
+          switch_id = resolve_sakura_id_by_combined(sv.configuration["switch"])
+          options = sv.configuration.merge(
             {
               "name"   => sv.resource_id,
               "switch" => switch_id
@@ -65,7 +65,7 @@ module SakurraForm
           server = compute.servers.create(options)
 
           sv_network = (col_networks.resources.find {|n| n.cached_state[:id] == switch_id}).cached_state[:subnets].first
-          sv_ipaddress = get_offset_address(sv_network["DefaultRoute"], sv.configuration.first["meta"]["network_offset"])
+          sv_ipaddress = get_offset_address(sv_network["DefaultRoute"], sv.configuration["meta"]["network_offset"])
           subnet ={
             :ipaddress => sv_ipaddress,
             :networkmasklen => sv_network["NetworkMaskLen"],
@@ -75,10 +75,12 @@ module SakurraForm
           disk_id = server.disks.first['ID']
           say("Associate #{sv_ipaddress} to #{sv.name}")
           volume.associate_ip_to_disk(disk_id, subnet)
+          say("Carve #{sv.name} as Hostname...")
+          volume.carve_hostname_on_disk(disk_id, sv.name)
 
           ## Regist Interfaces
-          if sv.configuration.first["interfaces"]
-            ifs = sv.configuration.first["interfaces"]
+          if sv.configuration["interfaces"]
+            ifs = sv.configuration["interfaces"]
             c_switches = ifs.map do |target_sw|
               say("Creating interface connected to #{target_sw}...")
               resolve_sakura_id_by_combined(target_sw)

data/lib/sakurraform/resource/base.rb

@@ -8,7 +8,7 @@ module SakurraForm
         type = self.class.to_s.split('::').last.downcase
         @name = name
         @resource_id = resolve_id_by_name(type, name)
-        @configuration = SakurraForm::Plans[type.to_sym].select {|a| a.name == name}
+        @configuration = (SakurraForm::Plans[type.to_sym].select {|a| a.name == name}).first
         @cached_state = @resource_id  ? collect_cached_state(type) : nil
         enable_remote = false unless @cached_state
         @remote_state = enable_remote ? collect_remote_state : nil

data/lib/sakurraform/resource/network.rb

@@ -4,7 +4,7 @@ module SakurraForm
       attr_reader :mode
       def initialize(name, enable_remote = false)
         super
-        if @configuration.first.has_key?(:networkmasklen)
+        if @configuration.has_key?(:networkmasklen)
           @mode = 'router'
         else
           @mode = 'switch'

data/lib/sakurraform/version.rb

@@ -1,3 +1,3 @@
 module SakurraForm
-  VERSION = "0.4.0"
+  VERSION = "0.4.1.dev"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sakurraform
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1.dev
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-22 00:00:00.000000000 Z
+date: 2015-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -187,9 +187,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8