sakurraform 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02ae66b0b76c0127cc6940b209973259717198c5
-  data.tar.gz: e04184a19103a833c64f3d76e77e14dd43f326dd
+  metadata.gz: 9287760a61364947413cf4f6c88c498b0fbd085c
+  data.tar.gz: b92b2150da96d4784702610e0cd9aab70be75163
 SHA512:
-  metadata.gz: 16d41e0aa6c18871181ab45fee6ddc6005234528e083830dcb802849b0e0fdf228714c2ab422ab39efaf38b5776ef691228c67922d2c8dc3f4dab3b5399de49b
-  data.tar.gz: 1e9948ddb2414c11b1c4811ade6a6359c87ffb504f02eb834be65ab0d27d3c748b45e6f32b51f93c52f4b33f0790135099bd60b105458226161beb8b54900d6d
+  metadata.gz: 3e12fb776aecc36a2ddf0134687d3a2151ab2f898c40ae264b305c0b3c98736dab94ef671d6017179a706f6b95efdf30cc4d8fd18c35ef4fa7c23f0f5d9d58d4
+  data.tar.gz: f175678362a85d55525bc5dc74de6dce6fc28d7351004add85091cee6e693d378408caeb10ca6a13f395e4ff3bcf8b5067c8e89071a6dd1c18d48269cd5dda62

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Not release or WIP
 
+## v0.5.0
+
+- Misc: Follow upstream change, fog-sakuracloud 1.7.x new Router model.
+- Feature: Region select.
+- Allow empty Server yaml.
 - Cleanup configuration of resource. (use first by default)
 
 ## v0.4.1
@@ -13,6 +18,7 @@
 - Support Simple L2 Switch
 - Support add interfaces for server.
 - SUpport connect interfaces to switch.
+>>>>>>> 097b0d37892cd7607f5a734441d40a65861a6789
 
 ## v0.3.0
 

data/README.md

@@ -49,6 +49,8 @@ Sakuracloud_api_token(required) ?  your_api_token
 Sakuracloud_api_token_secret(required) ?  your_api_secret
 Sakura Base Storage buket name(optional) ?  mybucket
 Sakura Base Storage token(optional) ?  mytoken
+Sakura Base Storage token(optional) ?  mytoken
+sakuracloud_api_region(default: is1b) ? tk1a
       create  .sakuracloud/credentials
 ```
 

data/lib/sakurraform/cli/init.rb

@@ -15,6 +15,7 @@ module SakurraForm
       @sakuracloud_api_token_secret = ask("Sakuracloud_api_token_secret(required) ? ")
       @sakura_object_storage_bucket = ask("Sakura Object Storage buket name(optional) ? ")
       @sakura_object_storage_token = ask("Sakura Object Storage token(optional) ? ")
+      @api_region = ask("sakuracloud_api_region(default: is1b) ? ")
       template('templates/credentials.tt', ".sakuracloud/credentials")
     end
   end

data/lib/sakurraform/cli/plan.rb

@@ -31,7 +31,7 @@ module SakurraForm
           case net.mode
           when 'router'
             router = network.routers.create(options)
-            switch = network.switches.find {|s| s.id == router.id}
+            switch = network.switches.find {|s| s.internet['ID'] == router.id}
           when 'switch'
             switch = network.switches.create(options)
           else

data/lib/sakurraform/collections.rb

@@ -10,7 +10,7 @@ module SakurraForm
       configuration = SakurraForm::Plans[@type.to_sym]
       configuration.each do |conf|
         @resources << SakurraForm::Resource.const_get(type.capitalize).new(conf[:name], enable_remote)
-      end
+      end if configuration
     end
   end
 end

data/lib/sakurraform/templates/credentials.tt

@@ -3,3 +3,4 @@ default:
   sakuracloud_api_token_secret: <%= @sakuracloud_api_token_secret %>
   sakura_object_storage_bucket: <%= @sakura_object_storage_bucket ? @sakura_object_storage_bucket : "null" %>
   sakura_object_storage_token: <%= @sakura_object_storage_token ? @sakura_object_storage_token : "null" %>
+  sakuracloud_api_zone: <%= @api_region %>

data/lib/sakurraform/templates/server.tt

@@ -5,6 +5,7 @@ server:
     sshkey: <%= ENV['SAKURA_SSH_KEYID'] %>
     volume:
       diskplan: 4
+      size_mb: 20480
       sourcearchive: 112500463685
     switch: network[defaultrouter]
     interfaces:
@@ -20,6 +21,7 @@ server:
     sshkey: <%= ENV['SAKURA_SSH_KEYID'] %>
     volume:
       diskplan: 4
+      size_mb: 20480
       sourcearchive: 112500463685
     switch: network[defaultrouter]
     interfaces:

data/lib/sakurraform/version.rb

@@ -1,3 +1,3 @@
 module SakurraForm
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sakurraform
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-27 00:00:00.000000000 Z
+date: 2015-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor