knife-openstack 2.1.7 → 3.0.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (17) hide show
  1. checksums.yaml +4 -4
  2. data/lib/chef/knife/cloud/openstack_service.rb +5 -3
  3. data/lib/chef/knife/openstack_flavor_list.rb +1 -1
  4. data/lib/chef/knife/openstack_floating_ip_allocate.rb +1 -1
  5. data/lib/chef/knife/openstack_floating_ip_associate.rb +1 -1
  6. data/lib/chef/knife/openstack_floating_ip_disassociate.rb +1 -1
  7. data/lib/chef/knife/openstack_floating_ip_list.rb +1 -1
  8. data/lib/chef/knife/openstack_floating_ip_release.rb +1 -1
  9. data/lib/chef/knife/openstack_image_list.rb +1 -1
  10. data/lib/chef/knife/openstack_network_list.rb +1 -1
  11. data/lib/chef/knife/openstack_server_create.rb +10 -9
  12. data/lib/chef/knife/openstack_server_delete.rb +1 -1
  13. data/lib/chef/knife/openstack_server_list.rb +1 -1
  14. data/lib/chef/knife/openstack_server_show.rb +1 -1
  15. data/lib/chef/knife/openstack_volume_list.rb +3 -2
  16. data/lib/knife-openstack/version.rb +1 -1
  17. metadata +10 -16
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a2a2d48a5b5ac264c9693312144b757c2503b2a1b3b5c753e95ac26bac56dacd
4
- data.tar.gz: ef663091c0af5196958e52476a08cc2fb90a795f6f78d4ab188a257139c0c22a
3
+ metadata.gz: 893c5909a78491c4fc25e39572e7360a9a7a15cb977e901032598ecb2461c179
4
+ data.tar.gz: f4e8d63647fc7ffb3a090ead708749f3195850ba079519f8a54d4b1d0ca0afd5
5
5
  SHA512:
6
- metadata.gz: 38175ab08d67e201464005acf13f2bbaecf89596b9b153075d489798a1bb7d1d50e5d78bef3430a7ff9a81707e377e47807de236c8e0c6c2b15ac6c154b97513
7
- data.tar.gz: 6ac31de76145bfcd50d0ad0d3d5372d702fdc64872b50734196d3fb5757875d0421e8c8b56ced7f2a2a83af3fd1fee6597e97ba1b10a3fcdf275c67abf2de91e
6
+ metadata.gz: e4dfe6c74483e8ebc2c16cb358c8ce0149e03a1733aa4fa82d53a340b552b4c3f87d7a940db1b9a1126a4e451ed0b12bc32b8a211b10fdc05d386a48f43eeef9
7
+ data.tar.gz: 39714c903a74e9ae4032cefe23ad8284d587fab9273b750797f238a288fd1155734e23f03285b3a1b53f690ac8739b672a912660849fee067f732dc99efc1f59
data/lib/chef/knife/cloud/openstack_service.rb CHANGED
@@ -1,7 +1,8 @@
1
1
  #
2
2
  # Author:: Siddheshwar More (<siddheshwar.more@clogeny.com>)
3
3
  # Author:: Kaustubh Deorukhkar (<kaustubh@clogeny.com>)
4
- # Copyright:: Copyright 2013-2018 Chef Software, Inc.
4
+ # Author:: Lance Albertson(<lance@osuosl.org>)
5
+ # Copyright:: Copyright 2013-2020 Chef Software, Inc.
5
6
  # License:: Apache License, Version 2.0
6
7
  #
7
8
  # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,6 +19,7 @@
18
19
  #
19
20
 
20
21
  require "chef/knife/cloud/fog/service"
22
+ require "fog/openstack"
21
23
 
22
24
  class Chef
23
25
  class Knife
@@ -67,8 +69,8 @@ class Chef
67
69
  }
68
70
 
69
71
  (
70
- Fog::Compute::OpenStack.requirements +
71
- Fog::Compute::OpenStack.recognized -
72
+ Fog::OpenStack::Compute.requirements +
73
+ Fog::OpenStack::Compute.recognized -
72
74
  [:openstack_api_key]
73
75
  ).each do |k|
74
76
  next unless k.to_s.start_with?("openstack")
data/lib/chef/knife/openstack_flavor_list.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  #
2
2
  # Author:: Prabhu Das (<prabhu.das@clogeny.com>)
3
- # Copyright:: Copyright 2014-2018 Chef Software, Inc.
3
+ # Copyright:: Copyright 2014-2020 Chef Software, Inc.
4
4
  # License:: Apache License, Version 2.0
5
5
  #
6
6
  # Licensed under the Apache License, Version 2.0 (the "License");
data/lib/chef/knife/openstack_floating_ip_allocate.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  #
2
2
  # Author:: Vasundhara Jagdale (<vasundhara.jagdale@clogeny.com>)
3
- # Copyright:: Copyright 2015-2018 Chef Software, Inc.
3
+ # Copyright:: Copyright 2015-2020 Chef Software, Inc.
4
4
  # License:: Apache License, Version 2.0
5
5
  #
6
6
  # Licensed under the Apache License, Version 2.0 (the "License");
data/lib/chef/knife/openstack_floating_ip_associate.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  #
2
2
  # Author:: Vasundhara Jagdale (<vasundhara.jagdale@clogeny.com>)
3
- # Copyright:: Copyright 2015-2018 Chef Software, Inc.
3
+ # Copyright:: Copyright 2015-2020 Chef Software, Inc.
4
4
  # License:: Apache License, Version 2.0
5
5
  #
6
6
  # Licensed under the Apache License, Version 2.0 (the "License");
data/lib/chef/knife/openstack_floating_ip_disassociate.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  #
2
2
  # Author:: Vasundhara Jagdale (<vasundhara.jagdale@clogeny.com>)
3
- # Copyright:: Copyright 2015-2018 Chef Software, Inc.
3
+ # Copyright:: Copyright 2015-2020 Chef Software, Inc.
4
4
  # License:: Apache License, Version 2.0
5
5
  #
6
6
  # Licensed under the Apache License, Version 2.0 (the "License");
data/lib/chef/knife/openstack_floating_ip_list.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  #
2
2
  # Author:: Vasundhara Jagdale (<vasundhara.jagdale@clogeny.com>)
3
- # Copyright:: Copyright 2015-2018 Chef Software, Inc.
3
+ # Copyright:: Copyright 2015-2020 Chef Software, Inc.
4
4
  # License:: Apache License, Version 2.0
5
5
  #
6
6
  # Licensed under the Apache License, Version 2.0 (the "License");
data/lib/chef/knife/openstack_floating_ip_release.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  #
2
2
  # Author:: Vasundhara Jagdale (<vasundhara.jagdale@clogeny.com>)
3
- # Copyright:: Copyright 2015-2018 Chef Software, Inc.
3
+ # Copyright:: Copyright 2015-2020 Chef Software, Inc.
4
4
  # License:: Apache License, Version 2.0
5
5
  #
6
6
  # Licensed under the Apache License, Version 2.0 (the "License");
data/lib/chef/knife/openstack_image_list.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  #
2
2
  # Author:: Prabhu Das (<prabhu.das@clogeny.com>)
3
- # Copyright:: Copyright 2014-2018 Chef Software, Inc.
3
+ # Copyright:: Copyright 2014-2020 Chef Software, Inc.
4
4
  # License:: Apache License, Version 2.0
5
5
  #
6
6
  # Licensed under the Apache License, Version 2.0 (the "License");
data/lib/chef/knife/openstack_network_list.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  #
2
2
  # Author:: Prabhu Das (<prabhu.das@clogeny.com>)
3
- # Copyright:: Copyright 2014-2018 Chef Software, Inc.
3
+ # Copyright:: Copyright 2014-2020 Chef Software, Inc.
4
4
  # License:: Apache License, Version 2.0
5
5
  #
6
6
  # Licensed under the Apache License, Version 2.0 (the "License");
data/lib/chef/knife/openstack_server_create.rb CHANGED
@@ -2,7 +2,8 @@
2
2
  # Author:: Seth Chisamore (<schisamo@chef.io>)
3
3
  # Author:: Matt Ray (<matt@chef.io>)
4
4
  # Author:: Chirag Jog (<chirag@clogeny.com>)
5
- # Copyright:: Copyright 2011-2018 Chef Software, Inc.
5
+ # Author:: Lance Albertson (<lance@osuosl.org>)
6
+ # Copyright:: Copyright 2011-2020 Chef Software, Inc.
6
7
  # License:: Apache License, Version 2.0
7
8
  #
8
9
  # Licensed under the Apache License, Version 2.0 (the "License");
@@ -175,11 +176,11 @@ class Chef
175
176
 
176
177
  errors = []
177
178
 
178
- if locate_config_value(:bootstrap_protocol) == "winrm"
179
- if locate_config_value(:winrm_password).nil?
180
- errors << "You must provide Winrm Password."
179
+ if locate_config_value(:connection_protocol) == "winrm"
180
+ if locate_config_value(:connection_password).nil?
181
+ errors << "You must provide Connection Password."
181
182
  end
182
- elsif locate_config_value(:bootstrap_protocol) != "ssh"
183
+ elsif locate_config_value(:connection_protocol) != "ssh"
183
184
  errors << "You must provide a valid bootstrap protocol. options [ssh/winrm]. For linux type images, options [ssh]"
184
185
  end
185
186
 
@@ -207,16 +208,16 @@ class Chef
207
208
  # floating requested without value
208
209
  if address.nil?
209
210
  if addresses.find_index { |a| a.fixed_ip.nil? }
210
- return true
211
+ true
211
212
  else
212
- return false # no floating IPs available
213
+ false # no floating IPs available
213
214
  end
214
215
  else
215
216
  # floating requested with value
216
217
  if addresses.find_index { |a| a.ip == address }
217
- return true
218
+ true
218
219
  else
219
- return false # requested floating IP does not exist
220
+ false # requested floating IP does not exist
220
221
  end
221
222
  end
222
223
  end
data/lib/chef/knife/openstack_server_delete.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  #
2
2
  # Author:: Siddheshwar More (<siddheshwar.more@clogeny.com>)
3
3
  # Author:: Kaustubh Deorukhkar (<kaustubh@clogeny.com>)
4
- # Copyright:: Copyright 2013-2018 Chef Software, Inc.
4
+ # Copyright:: Copyright 2013-2020 Chef Software, Inc.
5
5
  # License:: Apache License, Version 2.0
6
6
  #
7
7
  # Licensed under the Apache License, Version 2.0 (the "License");
data/lib/chef/knife/openstack_server_list.rb CHANGED
@@ -3,7 +3,7 @@
3
3
  # Author:: Matt Ray (<matt@chef.io>)
4
4
  # Author:: Chirag Jog (<chirag@clogeny.com>)
5
5
  # Author:: Prabhu Das (<prabhu.das@clogeny.com>)
6
- # Copyright:: Copyright 2011-2018 Chef Software, Inc.
6
+ # Copyright:: Copyright 2011-2020 Chef Software, Inc.
7
7
  # License:: Apache License, Version 2.0
8
8
  #
9
9
  # Licensed under the Apache License, Version 2.0 (the "License");
data/lib/chef/knife/openstack_server_show.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  #
2
- # Copyright:: Copyright 2011-2018 Chef Software, Inc.
2
+ # Copyright:: Copyright 2011-2020 Chef Software, Inc.
3
3
  # License:: Apache License, Version 2.0
4
4
  #
5
5
  # Licensed under the Apache License, Version 2.0 (the "License");
data/lib/chef/knife/openstack_volume_list.rb CHANGED
@@ -2,7 +2,8 @@
2
2
  # Author:: Seth Chisamore (<schisamo@chef.io>)
3
3
  # Author:: Matt Ray (<matt@chef.io>)
4
4
  # Author:: Evan Felix (<karcaw@gmail.com>)
5
- # Copyright:: Copyright 2011-2018 Chef Software, Inc.
5
+ # Author:: Lance Albertson (<lance@osuosl.org>)
6
+ # Copyright:: Copyright 2011-2020 Chef Software, Inc.
6
7
  # License:: Apache License, Version 2.0
7
8
  #
8
9
  # Licensed under the Apache License, Version 2.0 (the "License");
@@ -33,7 +34,7 @@ class Chef
33
34
  banner "knife openstack volume list (options)"
34
35
 
35
36
  def query_resource
36
- @service.connection.volumes
37
+ @service.connection.volumes.all({})
37
38
  rescue Excon::Errors::BadRequest => e
38
39
  response = Chef::JSONCompat.from_json(e.response.body)
39
40
  ui.fatal("Unknown server error (#{response["badRequest"]["code"]}): #{response["badRequest"]["message"]}")
data/lib/knife-openstack/version.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  #
2
2
  module Knife
3
3
  module OpenStack
4
- VERSION = "2.1.7".freeze
4
+ VERSION = "3.0.1".freeze
5
5
  MAJOR, MINOR, TINY = VERSION.split(".")
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,51 +1,48 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: knife-openstack
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.7
4
+ version: 3.0.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - JJ Asghar
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-12-30 00:00:00.000000000 Z
11
+ date: 2020-04-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
- name: fog
14
+ name: fog-openstack
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: '1.23'
19
+ version: '1.0'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: '1.23'
26
+ version: '1.0'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: chef
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - ">="
32
32
  - !ruby/object:Gem::Version
33
- version: '13'
33
+ version: '15'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - ">="
39
39
  - !ruby/object:Gem::Version
40
- version: '13'
40
+ version: '15'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: knife-cloud
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - ">="
46
- - !ruby/object:Gem::Version
47
- version: 1.2.0
48
- - - "<"
49
46
  - !ruby/object:Gem::Version
50
47
  version: '3.0'
51
48
  type: :runtime
@@ -53,12 +50,9 @@ dependencies:
53
50
  version_requirements: !ruby/object:Gem::Requirement
54
51
  requirements:
55
52
  - - ">="
56
- - !ruby/object:Gem::Version
57
- version: 1.2.0
58
- - - "<"
59
53
  - !ruby/object:Gem::Version
60
54
  version: '3.0'
61
- description: A Chef knife plugin for OpenStack clouds.
55
+ description: A Chef Infra knife plugin for OpenStack clouds.
62
56
  email:
63
57
  - jj@chef.io
64
58
  executables: []
@@ -97,7 +91,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
97
91
  requirements:
98
92
  - - ">="
99
93
  - !ruby/object:Gem::Version
100
- version: '2.3'
94
+ version: '2.6'
101
95
  required_rubygems_version: !ruby/object:Gem::Requirement
102
96
  requirements:
103
97
  - - ">="
@@ -107,5 +101,5 @@ requirements: []
107
101
  rubygems_version: 3.0.3
108
102
  signing_key:
109
103
  specification_version: 4
110
- summary: A Chef knife plugin for OpenStack clouds.
104
+ summary: A Chef Infra knife plugin for OpenStack clouds.
111
105
  test_files: []