sakurraform 0.4.1 → 0.5.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 02ae66b0b76c0127cc6940b209973259717198c5
4
- data.tar.gz: e04184a19103a833c64f3d76e77e14dd43f326dd
3
+ metadata.gz: 9287760a61364947413cf4f6c88c498b0fbd085c
4
+ data.tar.gz: b92b2150da96d4784702610e0cd9aab70be75163
5
5
  SHA512:
6
- metadata.gz: 16d41e0aa6c18871181ab45fee6ddc6005234528e083830dcb802849b0e0fdf228714c2ab422ab39efaf38b5776ef691228c67922d2c8dc3f4dab3b5399de49b
7
- data.tar.gz: 1e9948ddb2414c11b1c4811ade6a6359c87ffb504f02eb834be65ab0d27d3c748b45e6f32b51f93c52f4b33f0790135099bd60b105458226161beb8b54900d6d
6
+ metadata.gz: 3e12fb776aecc36a2ddf0134687d3a2151ab2f898c40ae264b305c0b3c98736dab94ef671d6017179a706f6b95efdf30cc4d8fd18c35ef4fa7c23f0f5d9d58d4
7
+ data.tar.gz: f175678362a85d55525bc5dc74de6dce6fc28d7351004add85091cee6e693d378408caeb10ca6a13f395e4ff3bcf8b5067c8e89071a6dd1c18d48269cd5dda62
@@ -2,6 +2,11 @@
2
2
 
3
3
  ## Not release or WIP
4
4
 
5
+ ## v0.5.0
6
+
7
+ - Misc: Follow upstream change, fog-sakuracloud 1.7.x new Router model.
8
+ - Feature: Region select.
9
+ - Allow empty Server yaml.
5
10
  - Cleanup configuration of resource. (use first by default)
6
11
 
7
12
  ## v0.4.1
@@ -13,6 +18,7 @@
13
18
  - Support Simple L2 Switch
14
19
  - Support add interfaces for server.
15
20
  - SUpport connect interfaces to switch.
21
+ >>>>>>> 097b0d37892cd7607f5a734441d40a65861a6789
16
22
 
17
23
  ## v0.3.0
18
24
 
data/README.md CHANGED
@@ -49,6 +49,8 @@ Sakuracloud_api_token(required) ? your_api_token
49
49
  Sakuracloud_api_token_secret(required) ? your_api_secret
50
50
  Sakura Base Storage buket name(optional) ? mybucket
51
51
  Sakura Base Storage token(optional) ? mytoken
52
+ Sakura Base Storage token(optional) ? mytoken
53
+ sakuracloud_api_region(default: is1b) ? tk1a
52
54
  create .sakuracloud/credentials
53
55
  ```
54
56
 
@@ -15,6 +15,7 @@ module SakurraForm
15
15
  @sakuracloud_api_token_secret = ask("Sakuracloud_api_token_secret(required) ? ")
16
16
  @sakura_object_storage_bucket = ask("Sakura Object Storage buket name(optional) ? ")
17
17
  @sakura_object_storage_token = ask("Sakura Object Storage token(optional) ? ")
18
+ @api_region = ask("sakuracloud_api_region(default: is1b) ? ")
18
19
  template('templates/credentials.tt', ".sakuracloud/credentials")
19
20
  end
20
21
  end
@@ -31,7 +31,7 @@ module SakurraForm
31
31
  case net.mode
32
32
  when 'router'
33
33
  router = network.routers.create(options)
34
- switch = network.switches.find {|s| s.id == router.id}
34
+ switch = network.switches.find {|s| s.internet['ID'] == router.id}
35
35
  when 'switch'
36
36
  switch = network.switches.create(options)
37
37
  else
@@ -10,7 +10,7 @@ module SakurraForm
10
10
  configuration = SakurraForm::Plans[@type.to_sym]
11
11
  configuration.each do |conf|
12
12
  @resources << SakurraForm::Resource.const_get(type.capitalize).new(conf[:name], enable_remote)
13
- end
13
+ end if configuration
14
14
  end
15
15
  end
16
16
  end
@@ -3,3 +3,4 @@ default:
3
3
  sakuracloud_api_token_secret: <%= @sakuracloud_api_token_secret %>
4
4
  sakura_object_storage_bucket: <%= @sakura_object_storage_bucket ? @sakura_object_storage_bucket : "null" %>
5
5
  sakura_object_storage_token: <%= @sakura_object_storage_token ? @sakura_object_storage_token : "null" %>
6
+ sakuracloud_api_zone: <%= @api_region %>
@@ -5,6 +5,7 @@ server:
5
5
  sshkey: <%= ENV['SAKURA_SSH_KEYID'] %>
6
6
  volume:
7
7
  diskplan: 4
8
+ size_mb: 20480
8
9
  sourcearchive: 112500463685
9
10
  switch: network[defaultrouter]
10
11
  interfaces:
@@ -20,6 +21,7 @@ server:
20
21
  sshkey: <%= ENV['SAKURA_SSH_KEYID'] %>
21
22
  volume:
22
23
  diskplan: 4
24
+ size_mb: 20480
23
25
  sourcearchive: 112500463685
24
26
  switch: network[defaultrouter]
25
27
  interfaces:
@@ -1,3 +1,3 @@
1
1
  module SakurraForm
2
- VERSION = "0.4.1"
2
+ VERSION = "0.5.0"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sakurraform
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.1
4
+ version: 0.5.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - sawanoboly
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-09-27 00:00:00.000000000 Z
11
+ date: 2015-12-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: thor