knife-cloud 1.2.0 → 1.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (14) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +0 -13
  3. data/CHANGELOG.md +129 -12
  4. data/Gemfile +1 -1
  5. data/Rakefile +7 -7
  6. data/knife-cloud.gemspec +12 -12
  7. data/lib/chef/knife/cloud/chefbootstrap/bootstrap_options.rb +10 -0
  8. data/lib/chef/knife/cloud/chefbootstrap/bootstrap_protocol.rb +4 -1
  9. data/lib/chef/knife/cloud/chefbootstrap/winrm_bootstrap_protocol.rb +1 -0
  10. data/lib/knife-cloud/version.rb +1 -1
  11. data/spec/unit/bootstrap_protocol_spec.rb +7 -1
  12. data/spec/unit/ssh_bootstrap_protocol_spec.rb +1 -1
  13. data/spec/unit/winrm_bootstrap_protocol_spec.rb +3 -1
  14. metadata +18 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 4ee4f881dd2d188f7667e32dd23170942f908827
4
- data.tar.gz: c2eb79c92ecbe38059ded6138802f67ce7531f45
3
+ metadata.gz: 0dffb3f762fabd5c361aa9b75c9664c201da6473
4
+ data.tar.gz: 82bb614bfa626c8d0048a9473de8b3185451751a
5
5
  SHA512:
6
- metadata.gz: 9de1b62043893d528a727d619be4f77448b8fa72b02650b28f77a202630a8976177c6210c5c113ce36bdd18acb370c8de976565de211457e6b854e8b6e986f68
7
- data.tar.gz: 590e7718a81e42b18d99a13d4bc2535b5eef192fdcc8f82939d4da0db3ae2e42e019651a886c41353f8447c66c5328ab64183b979bbfd901adc647cf8890bfa0
6
+ metadata.gz: 8e49df45f0bce339410f742445b94411d20ab2711828395f08a1897947c8a3d5d5025284f1f06ddae93c91f4760ae74dd2fb646b5fbd38d1d82d3e26d4894e57
7
+ data.tar.gz: e047f78d7412473e0509bb43ff1154a602c3389f0fbfb740d201d8cd128a12f494ec2254a914cc47f0a10eb95b0a7d797a55632e0b645bcbfe78f70126dfc294
data/.travis.yml CHANGED
@@ -1,19 +1,6 @@
1
1
  rvm:
2
- - 1.9.3
3
2
  - 2.0.0
4
3
 
5
4
  gemfile: ci.gemfile
6
5
 
7
- env:
8
- - CHEF_VERSION="master"
9
- - CHEF_VERSION="~> 12.0"
10
- - CHEF_VERSION="< 12"
11
-
12
- matrix:
13
- exclude:
14
- - rvm: 1.9.3
15
- env: CHEF_VERSION="master"
16
- - rvm: 1.9.3
17
- env: CHEF_VERSION="~> 12.0"
18
-
19
6
  script: bundle exec rake spec
data/CHANGELOG.md CHANGED
@@ -1,16 +1,133 @@
1
- # knife-cloud Change Log
1
+ # Change Log
2
2
 
3
- ## Unreleased
4
- * No changes unreleased
3
+ ## [v1.2.1](https://github.com/chef/knife-cloud/tree/v1.2.1) (2016-02-24)
5
4
 
6
- Last Release: v1.0.1 (2014-09-19)
7
- ---------------------------------
8
- * Limit hostnames to 15 characters (for Windows)
5
+ [Full Changelog](https://github.com/chef/knife-cloud/compare/v1.2.0...v1.2.1)
9
6
 
10
- v1.0.0 (2014-08-11)
11
- ---------------------------------
12
- * Make the `Fog` gem a dev dependency
7
+ **Merged pull requests:**
13
8
 
14
- v1.0.0.rc.0 (2014-07-25)
15
- ------------------------
16
- - First public release candidate
9
+ - Passing bootstrap\_ip\_address as an array object instead of string [\#101](https://github.com/chef/knife-cloud/pull/101) ([NimishaS](https://github.com/NimishaS))
10
+ - Added new knife windows options [\#98](https://github.com/chef/knife-cloud/pull/98) ([siddheshwar-more](https://github.com/siddheshwar-more))
11
+
12
+ ## [v1.2.0](https://github.com/chef/knife-cloud/tree/v1.2.0) (2015-07-18)
13
+ [Full Changelog](https://github.com/chef/knife-cloud/compare/v1.2.0.rc.0...v1.2.0)
14
+
15
+ **Closed issues:**
16
+
17
+ - both -F json ad --format json does not work [\#91](https://github.com/chef/knife-cloud/issues/91)
18
+
19
+ **Merged pull requests:**
20
+
21
+ - Adding support for floating ip commands [\#96](https://github.com/chef/knife-cloud/pull/96) ([Vasu1105](https://github.com/Vasu1105))
22
+
23
+ ## [v1.2.0.rc.0](https://github.com/chef/knife-cloud/tree/v1.2.0.rc.0) (2015-06-25)
24
+ [Full Changelog](https://github.com/chef/knife-cloud/compare/v1.1.0...v1.2.0.rc.0)
25
+
26
+ **Merged pull requests:**
27
+
28
+ - Show result in the format provided by user in -F or --format option [\#93](https://github.com/chef/knife-cloud/pull/93) ([NimishaS](https://github.com/NimishaS))
29
+
30
+ ## [v1.1.0](https://github.com/chef/knife-cloud/tree/v1.1.0) (2015-06-18)
31
+ [Full Changelog](https://github.com/chef/knife-cloud/compare/v1.1.0.rc.0...v1.1.0)
32
+
33
+ **Merged pull requests:**
34
+
35
+ - bumped the version for a full release [\#92](https://github.com/chef/knife-cloud/pull/92) ([jjasghar](https://github.com/jjasghar))
36
+
37
+ ## [v1.1.0.rc.0](https://github.com/chef/knife-cloud/tree/v1.1.0.rc.0) (2015-06-10)
38
+ [Full Changelog](https://github.com/chef/knife-cloud/compare/1.0.1...v1.1.0.rc.0)
39
+
40
+ **Closed issues:**
41
+
42
+ - Unable to create server w/ v1.0 [\#82](https://github.com/chef/knife-cloud/issues/82)
43
+
44
+ **Merged pull requests:**
45
+
46
+ - Updated an RC version [\#90](https://github.com/chef/knife-cloud/pull/90) ([jjasghar](https://github.com/jjasghar))
47
+ - Updated the readme [\#89](https://github.com/chef/knife-cloud/pull/89) ([jjasghar](https://github.com/jjasghar))
48
+ - the chef\_version is broken [\#88](https://github.com/chef/knife-cloud/pull/88) ([jjasghar](https://github.com/jjasghar))
49
+ - Looks like you doubled up some code [\#87](https://github.com/chef/knife-cloud/pull/87) ([jjasghar](https://github.com/jjasghar))
50
+ - Update knife-cloud to have all the new bootstrap options of Chef 12 [\#85](https://github.com/chef/knife-cloud/pull/85) ([NimishaS](https://github.com/NimishaS))
51
+ - remove 'em-winrm' gem dependency [\#83](https://github.com/chef/knife-cloud/pull/83) ([prabhu-das](https://github.com/prabhu-das))
52
+
53
+ ## [1.0.1](https://github.com/chef/knife-cloud/tree/1.0.1) (2014-09-19)
54
+ [Full Changelog](https://github.com/chef/knife-cloud/compare/1.0.0...1.0.1)
55
+
56
+ **Closed issues:**
57
+
58
+ - floating-ips seem to throw an error with knife-openstack [\#78](https://github.com/chef/knife-cloud/issues/78)
59
+ - -i and -x no longer work with ssh [\#74](https://github.com/chef/knife-cloud/issues/74)
60
+
61
+ **Merged pull requests:**
62
+
63
+ - Limit hostnames to 15 characters \(for windows\) [\#81](https://github.com/chef/knife-cloud/pull/81) ([hh](https://github.com/hh))
64
+
65
+ ## [1.0.0](https://github.com/chef/knife-cloud/tree/1.0.0) (2014-08-11)
66
+ [Full Changelog](https://github.com/chef/knife-cloud/compare/1.0.0.rc.0...1.0.0)
67
+
68
+ **Merged pull requests:**
69
+
70
+ - Release knife-cloud 1.0.0 [\#80](https://github.com/chef/knife-cloud/pull/80) ([adamedx](https://github.com/adamedx))
71
+ - \[knife-cloud\] Change Fog to dev dependency [\#79](https://github.com/chef/knife-cloud/pull/79) ([siddheshwar-more](https://github.com/siddheshwar-more))
72
+
73
+ ## [1.0.0.rc.0](https://github.com/chef/knife-cloud/tree/1.0.0.rc.0) (2014-07-27)
74
+ **Closed issues:**
75
+
76
+ - -a for floating IPs is broken with knife-openstack [\#76](https://github.com/chef/knife-cloud/issues/76)
77
+
78
+ **Merged pull requests:**
79
+
80
+ - Release candidate knife-cloud 1.0.0.rc.0 [\#77](https://github.com/chef/knife-cloud/pull/77) ([adamedx](https://github.com/adamedx))
81
+ - \[knife-cloud\] Common short options in ssh & winrm \(SSH override winrm config\) [\#75](https://github.com/chef/knife-cloud/pull/75) ([siddheshwar-more](https://github.com/siddheshwar-more))
82
+ - \[knife-cloud\] Add missing bootstrap options to knife-cloud [\#73](https://github.com/chef/knife-cloud/pull/73) ([siddheshwar-more](https://github.com/siddheshwar-more))
83
+ - Added changes for template-file option [\#72](https://github.com/chef/knife-cloud/pull/72) ([kaustubh-d](https://github.com/kaustubh-d))
84
+ - knife-ec2 master to knife-ec2 knife-cloud sync [\#71](https://github.com/chef/knife-cloud/pull/71) ([prabhu-das](https://github.com/prabhu-das))
85
+ - Specify name or id for image and flavor in server create [\#70](https://github.com/chef/knife-cloud/pull/70) ([kaustubh-d](https://github.com/kaustubh-d))
86
+ - \[knife-cloud\] Fixes for rspec deprecated warnings [\#69](https://github.com/chef/knife-cloud/pull/69) ([siddheshwar-more](https://github.com/siddheshwar-more))
87
+ - Sorting list outputs by sort\_by\_field with case insensitive sort. [\#68](https://github.com/chef/knife-cloud/pull/68) ([prabhu-das](https://github.com/prabhu-das))
88
+ - \[knife-cloud\] KNIFE-477: Delete server by name if instance\_id isn't found [\#67](https://github.com/chef/knife-cloud/pull/67) ([ameyavarade](https://github.com/ameyavarade))
89
+ - Changes for enabling network list [\#66](https://github.com/chef/knife-cloud/pull/66) ([prabhu-das](https://github.com/prabhu-das))
90
+ - Refactored redundant code. [\#65](https://github.com/chef/knife-cloud/pull/65) ([ameyavarade](https://github.com/ameyavarade))
91
+ - Fixed code and spec for Excon error [\#64](https://github.com/chef/knife-cloud/pull/64) ([prabhu-das](https://github.com/prabhu-das))
92
+ - Remove extraneous use of active-support for the better good [\#63](https://github.com/chef/knife-cloud/pull/63) ([btm](https://github.com/btm))
93
+ - Rebase integration tests [\#61](https://github.com/chef/knife-cloud/pull/61) ([muktaa](https://github.com/muktaa))
94
+ - OC-10611 implementation for custom\_arguments passed to Fog [\#57](https://github.com/chef/knife-cloud/pull/57) ([prabhu-das](https://github.com/prabhu-das))
95
+ - Updated test windows template to latest knife windows \( -V 0.5.14\) template. [\#56](https://github.com/chef/knife-cloud/pull/56) ([siddheshwar-more](https://github.com/siddheshwar-more))
96
+ - OC-11210 EC2 refactored code has ambiguity in the name of short-option for Gateway & Groups [\#54](https://github.com/chef/knife-cloud/pull/54) ([siddheshwar-more](https://github.com/siddheshwar-more))
97
+ - OC-11204 - Exception handling and abstraction [\#53](https://github.com/chef/knife-cloud/pull/53) ([kaustubh-d](https://github.com/kaustubh-d))
98
+ - OC-11140 nested values support [\#51](https://github.com/chef/knife-cloud/pull/51) ([prabhu-das](https://github.com/prabhu-das))
99
+ - OC-10823 knife-ec2 server create and bootstrap windows instance using ssh [\#48](https://github.com/chef/knife-cloud/pull/48) ([siddheshwar-more](https://github.com/siddheshwar-more))
100
+ - Handle fog errors in knife-cloud [\#47](https://github.com/chef/knife-cloud/pull/47) ([siddheshwar-more](https://github.com/siddheshwar-more))
101
+ - Updated code to reflect server name for both openstack and ec2 when --ch... [\#46](https://github.com/chef/knife-cloud/pull/46) ([prabhu-das](https://github.com/prabhu-das))
102
+ - OC-10520 knife-cloud should add data summary methods [\#43](https://github.com/chef/knife-cloud/pull/43) ([ameyavarade](https://github.com/ameyavarade))
103
+ - OC-9950 Support common options of knife bootstrap in knife cloud [\#42](https://github.com/chef/knife-cloud/pull/42) ([siddheshwar-more](https://github.com/siddheshwar-more))
104
+ - OC-9596: Succesfully run the integration tests on jenkins for knife-openstack\(based on knife-cloud\) [\#41](https://github.com/chef/knife-cloud/pull/41) ([adamedx](https://github.com/adamedx))
105
+ - OC-9430: Knife cloud should support endpoint config and cli option [\#40](https://github.com/chef/knife-cloud/pull/40) ([adamedx](https://github.com/adamedx))
106
+ - Let knife-windows find the template based on distro supplied. [\#38](https://github.com/chef/knife-cloud/pull/38) ([chirag-jog](https://github.com/chirag-jog))
107
+ - Updated rspec tests for server list, create command [\#36](https://github.com/chef/knife-cloud/pull/36) ([adamedx](https://github.com/adamedx))
108
+ - Updated rspec tests for server list, create command [\#35](https://github.com/chef/knife-cloud/pull/35) ([siddheshwar-more](https://github.com/siddheshwar-more))
109
+ - OC-9613: os\_image\_type should be inferred from bootstrap protocol if not specified to knife cloud [\#34](https://github.com/chef/knife-cloud/pull/34) ([adamedx](https://github.com/adamedx))
110
+ - OC-9533 knife CLOUD server list needs to expose Chef data \(node names, attributes\) [\#33](https://github.com/chef/knife-cloud/pull/33) ([siddheshwar-more](https://github.com/siddheshwar-more))
111
+ - OC-9207: OC-9390: Dynamic Fog gem versioning, Exit code handling [\#31](https://github.com/chef/knife-cloud/pull/31) ([adamedx](https://github.com/adamedx))
112
+ - OC 9450 - Auto generate chef node name when not input by user [\#30](https://github.com/chef/knife-cloud/pull/30) ([muktaa](https://github.com/muktaa))
113
+ - OC-8965: Provide CLI option to delete server on bootstrap failure [\#28](https://github.com/chef/knife-cloud/pull/28) ([adamedx](https://github.com/adamedx))
114
+ - OC-9368 Image\_os\_type option should be compulsory in knife-openstack. [\#26](https://github.com/chef/knife-cloud/pull/26) ([siddheshwar-more](https://github.com/siddheshwar-more))
115
+ - Sprint 86: Merge Gem dependencies, Travis support [\#24](https://github.com/chef/knife-cloud/pull/24) ([adamedx](https://github.com/adamedx))
116
+ - oc 8965 delete server when bootstrap fails [\#23](https://github.com/chef/knife-cloud/pull/23) ([muktaa](https://github.com/muktaa))
117
+ - 9107 knife cloud travis [\#22](https://github.com/chef/knife-cloud/pull/22) ([muktaa](https://github.com/muktaa))
118
+ - Windows bootstrap support + correct gem dependency for knife-windows [\#20](https://github.com/chef/knife-cloud/pull/20) ([muktaa](https://github.com/muktaa))
119
+ - Windows bootstrap support + correct gem dependency for knife-windows [\#18](https://github.com/chef/knife-cloud/pull/18) ([muktaa](https://github.com/muktaa))
120
+ - OC-8572: Knife cloud openstack create with bootstrap Windows [\#16](https://github.com/chef/knife-cloud/pull/16) ([adamedx](https://github.com/adamedx))
121
+ - OC-8822: Knife cloud openstack server list command [\#15](https://github.com/chef/knife-cloud/pull/15) ([adamedx](https://github.com/adamedx))
122
+ - Resource Listing changes \(OC 8822, 8824, 8825, 8826\) [\#13](https://github.com/chef/knife-cloud/pull/13) ([muktaa](https://github.com/muktaa))
123
+ - Add notices to sources [\#12](https://github.com/chef/knife-cloud/pull/12) ([adamedx](https://github.com/adamedx))
124
+ - First working version of knife-cloud \(merged and rebased\) [\#10](https://github.com/chef/knife-cloud/pull/10) ([chirag-jog](https://github.com/chirag-jog))
125
+ - Knife cloud plugin [\#9](https://github.com/chef/knife-cloud/pull/9) ([muktaa](https://github.com/muktaa))
126
+ - OC-8310: Base framework library for knife plug-in tests [\#8](https://github.com/chef/knife-cloud/pull/8) ([adamedx](https://github.com/adamedx))
127
+ - OC-8427: OC-8426: OC-8425: OC-8428: Unit tests for knife-cloud [\#7](https://github.com/chef/knife-cloud/pull/7) ([adamedx](https://github.com/adamedx))
128
+ - OC-8312: Knife-cloud gem skeleton [\#6](https://github.com/chef/knife-cloud/pull/6) ([adamedx](https://github.com/adamedx))
129
+ - OC-8312 Knife-cloud gem skeleton [\#3](https://github.com/chef/knife-cloud/pull/3) ([kaustubh-d](https://github.com/kaustubh-d))
130
+
131
+
132
+
133
+ \* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
data/Gemfile CHANGED
@@ -1,4 +1,4 @@
1
- source "https://rubygems.org"
1
+ source 'https://rubygems.org'
2
2
 
3
3
  # Specify your gem's dependencies in knife-cloud.gemspec
4
4
  gemspec
data/Rakefile CHANGED
@@ -7,29 +7,29 @@ Bundler::GemHelper.install_tasks
7
7
  require 'rubygems'
8
8
  require 'rubygems/package_task'
9
9
 
10
- task :default => :all
11
- task :all => [:spec, :uninstall, :install]
10
+ task default: :all
11
+ task all: [:spec, :uninstall, :install]
12
12
 
13
13
  # Packaging
14
- GEM_NAME = "knife-cloud"
14
+ GEM_NAME = 'knife-cloud'.freeze
15
15
  require File.dirname(__FILE__) + '/lib/knife-cloud/version'
16
- spec = eval(File.read("knife-cloud.gemspec"))
16
+ spec = eval(File.read('knife-cloud.gemspec'))
17
17
  Gem::PackageTask.new(spec) do |pkg|
18
18
  pkg.gem_spec = spec
19
19
  end
20
20
 
21
21
  desc "uninstall #{GEM_NAME}-#{Knife::Cloud::VERSION}.gem from system..."
22
22
  task :uninstall do
23
- sh %{gem uninstall #{GEM_NAME} -x -v #{Knife::Cloud::VERSION} }
23
+ sh %(gem uninstall #{GEM_NAME} -x -v #{Knife::Cloud::VERSION} )
24
24
  end
25
25
 
26
26
  # rspec
27
27
  begin
28
28
  require 'rspec/core/rake_task'
29
- desc "Run all specs in spec directory"
29
+ desc 'Run all specs in spec directory'
30
30
  RSpec::Core::RakeTask.new(:spec) do |t|
31
31
  t.pattern = 'spec/unit/**/*_spec.rb'
32
32
  end
33
33
  rescue LoadError
34
34
  STDERR.puts "\n*** RSpec not available. (sudo) gem install rspec to run unit tests. ***\n\n"
35
- end
35
+ end
data/knife-cloud.gemspec CHANGED
@@ -1,26 +1,26 @@
1
1
  # -*- encoding: utf-8 -*-
2
- $:.push File.expand_path("../lib", __FILE__)
3
- require "knife-cloud/version"
2
+ $LOAD_PATH.push File.expand_path('../lib', __FILE__)
3
+ require 'knife-cloud/version'
4
4
 
5
5
  Gem::Specification.new do |s|
6
- s.name = "knife-cloud"
6
+ s.name = 'knife-cloud'
7
7
  s.version = Knife::Cloud::VERSION
8
8
  s.platform = Gem::Platform::RUBY
9
- s.extra_rdoc_files = ["README.md", "LICENSE" ]
10
- s.authors = ["Kaustubh Deorukhkar", "Ameya Varade"]
11
- s.email = ["dev@getchef.com"]
12
- s.homepage = "https://github.com/opscode/knife-cloud"
13
- s.summary = %q{knife-cloud plugin}
9
+ s.extra_rdoc_files = ['README.md', 'LICENSE']
10
+ s.authors = ['Kaustubh Deorukhkar', 'Ameya Varade']
11
+ s.email = ['dev@chef.io']
12
+ s.homepage = 'https://github.com/chef/knife-cloud'
13
+ s.summary = 'knife-cloud plugin'
14
14
  s.description = s.summary
15
15
 
16
16
  s.files = `git ls-files`.split("\n")
17
17
  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
18
- s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
19
- s.require_paths = ["lib", "spec"]
18
+ s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
19
+ s.require_paths = %w(lib spec)
20
20
 
21
21
  s.add_dependency 'knife-windows', '>= 0.5.14'
22
- s.add_dependency "chef", ">= 0.10.10"
22
+ s.add_dependency 'chef', '>= 0.10.10'
23
23
  s.add_dependency 'mixlib-shellout'
24
24
 
25
- %w(rspec-core rspec-expectations rspec-mocks rspec_junit_formatter fog).each { |gem| s.add_development_dependency gem }
25
+ %w(rspec-core rspec-expectations rspec-mocks rspec_junit_formatter fog rubocop).each { |gem| s.add_development_dependency gem }
26
26
  end
data/lib/chef/knife/cloud/chefbootstrap/bootstrap_options.rb CHANGED
@@ -228,6 +228,16 @@ class Chef
228
228
  Chef::Config[:knife][:bootstrap_vault_item][vault].push(item)
229
229
  Chef::Config[:knife][:bootstrap_vault_item]
230
230
  }
231
+ option :msi_url,
232
+ :short => "-u URL",
233
+ :long => "--msi-url URL",
234
+ :description => "Location of the Chef Client MSI. The default templates will prefer to download from this location. The MSI will be downloaded from chef.io if not provided.",
235
+ :default => ''
236
+
237
+ option :install_as_service,
238
+ :long => "--install-as-service",
239
+ :description => "Install chef-client as service in windows machine",
240
+ :default => false
231
241
 
232
242
  end
233
243
  end
data/lib/chef/knife/cloud/chefbootstrap/bootstrap_protocol.rb CHANGED
@@ -46,7 +46,7 @@ class Chef
46
46
 
47
47
  def init_bootstrap_options
48
48
  # set the command bootstrap options.
49
- bootstrap.name_args = locate_config_value(:bootstrap_ip_address)
49
+ bootstrap.name_args << locate_config_value(:bootstrap_ip_address)
50
50
  bootstrap.config[:chef_node_name] = locate_config_value(:chef_node_name)
51
51
  bootstrap.config[:run_list] = locate_config_value(:run_list)
52
52
  bootstrap.config[:prerelease] = locate_config_value(:prerelease)
@@ -73,6 +73,9 @@ class Chef
73
73
  bootstrap.config[:bootstrap_vault_json] = locate_config_value(:bootstrap_vault_json)
74
74
  bootstrap.config[:bootstrap_vault_item] = locate_config_value(:bootstrap_vault_item)
75
75
  bootstrap.config[:use_sudo_password] = locate_config_value(:use_sudo_password)
76
+ bootstrap.config[:msi_url] = locate_config_value(:msi_url)
77
+ bootstrap.config[:install_as_service] = locate_config_value(:install_as_service)
78
+ bootstrap.config[:session_timeout] = locate_config_value(:session_timeout)
76
79
  end
77
80
 
78
81
  end
data/lib/chef/knife/cloud/chefbootstrap/winrm_bootstrap_protocol.rb CHANGED
@@ -43,6 +43,7 @@ class Chef
43
43
  bootstrap.config[:winrm_transport] = @config[:winrm_transport]
44
44
  bootstrap.config[:winrm_port] = @config[:winrm_port]
45
45
  bootstrap.config[:auth_timeout] = @config[:auth_timeout]
46
+ bootstrap.config[:winrm_ssl_verify_mode] = @config[:winrm_ssl_verify_mode]
46
47
  super
47
48
  end
48
49
 
data/lib/knife-cloud/version.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  module Knife
2
2
  module Cloud
3
- VERSION = "1.2.0"
3
+ VERSION = "1.2.1"
4
4
  MAJOR, MINOR, TINY = VERSION.split('.')
5
5
  end
6
6
  end
data/spec/unit/bootstrap_protocol_spec.rb CHANGED
@@ -66,10 +66,13 @@ describe Chef::Knife::Cloud::BootstrapProtocol do
66
66
  @config[:bootstrap_wget_options] = "-e use_proxy=yes -e http://myproxy.com:8080"
67
67
  @config[:bootstrap_curl_options] = "--proxy http://myproxy.com:8080"
68
68
  @config[:use_sudo_password] = "true"
69
+ @config[:msi_url] = "https://opscode-omnibus-packages.s3.amazonaws.com/windows/2008r2/x86_64/chef-client-12.3.0-1.msi"
70
+ @config[:session_timeout] = "42"
71
+ @config[:install_as_service] = "true"
69
72
  allow(@config).to receive(:locate_config_value).and_return({})
70
73
  @instance.bootstrap = Chef::Knife::Bootstrap.new
71
74
  @instance.init_bootstrap_options
72
- expect(@instance.bootstrap.name_args).to eq(@config[:bootstrap_ip_address])
75
+ expect(@instance.bootstrap.name_args).to eq([@config[:bootstrap_ip_address]])
73
76
  expect(@instance.bootstrap.config[:chef_node_name]).to eq(@config[:chef_node_name])
74
77
  expect(@instance.bootstrap.config[:environment]).to eq(@config[:environment])
75
78
  expect(@instance.bootstrap.config[:first_boot_attributes]).to eq(@config[:first_boot_attributes])
@@ -87,6 +90,9 @@ describe Chef::Knife::Cloud::BootstrapProtocol do
87
90
  expect(@instance.bootstrap.config[:bootstrap_wget_options]).to eq(@config[:bootstrap_wget_options])
88
91
  expect(@instance.bootstrap.config[:bootstrap_curl_options]).to eq(@config[:bootstrap_curl_options])
89
92
  expect(@instance.bootstrap.config[:use_sudo_password]).to eq(@config[:use_sudo_password])
93
+ expect(@instance.bootstrap.config[:msi_url]).to eq(@config[:msi_url])
94
+ expect(@instance.bootstrap.config[:install_as_service]).to eq(@config[:install_as_service])
95
+ expect(@instance.bootstrap.config[:session_timeout]).to eq(@config[:session_timeout])
90
96
  end
91
97
  end
92
98
  end
data/spec/unit/ssh_bootstrap_protocol_spec.rb CHANGED
@@ -65,7 +65,7 @@ describe Chef::Knife::Cloud::SshBootstrapProtocol do
65
65
  allow(@config).to receive(:locate_config_value).and_return({})
66
66
  @instance.bootstrap = Chef::Knife::Bootstrap.new
67
67
  @instance.init_bootstrap_options
68
- expect(@instance.bootstrap.name_args).to eq(@config[:bootstrap_ip_address])
68
+ expect(@instance.bootstrap.name_args).to eq([@config[:bootstrap_ip_address]])
69
69
  expect(@instance.bootstrap.config[:chef_node_name]).to eq(@config[:chef_node_name])
70
70
  expect(@instance.bootstrap.config[:environment]).to eq(@config[:environment])
71
71
  expect(@instance.bootstrap.config[:ssh_user]).to eq(@config[:ssh_user])
data/spec/unit/winrm_bootstrap_protocol_spec.rb CHANGED
@@ -55,13 +55,15 @@ describe Chef::Knife::Cloud::WinrmBootstrapProtocol do
55
55
  @config[:environment] = "_default"
56
56
  @config[:winrm_user] = "testuser"
57
57
  @config[:auth_timeout] = "100"
58
+ @config[:winrm_ssl_verify_mode] = "verify_none"
58
59
  @instance.bootstrap = Chef::Knife::Bootstrap.new
59
60
  @instance.init_bootstrap_options
60
- expect(@instance.bootstrap.name_args).to eq(@config[:bootstrap_ip_address])
61
+ expect(@instance.bootstrap.name_args).to eq([@config[:bootstrap_ip_address]])
61
62
  expect(@instance.bootstrap.config[:chef_node_name]).to eq(@config[:chef_node_name])
62
63
  expect(@instance.bootstrap.config[:environment]).to eq(@config[:environment])
63
64
  expect(@instance.bootstrap.config[:winrm_user]).to eq(@config[:winrm_user])
64
65
  expect(@instance.bootstrap.config[:auth_timeout]).to eq(@config[:auth_timeout])
66
+ expect(@instance.bootstrap.config[:winrm_ssl_verify_mode]).to eq(@config[:winrm_ssl_verify_mode])
65
67
  end
66
68
  end
67
69
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: knife-cloud
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.0
4
+ version: 1.2.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Kaustubh Deorukhkar
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2015-07-18 00:00:00.000000000 Z
12
+ date: 2016-02-24 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: knife-windows
@@ -123,9 +123,23 @@ dependencies:
123
123
  - - ">="
124
124
  - !ruby/object:Gem::Version
125
125
  version: '0'
126
+ - !ruby/object:Gem::Dependency
127
+ name: rubocop
128
+ requirement: !ruby/object:Gem::Requirement
129
+ requirements:
130
+ - - ">="
131
+ - !ruby/object:Gem::Version
132
+ version: '0'
133
+ type: :development
134
+ prerelease: false
135
+ version_requirements: !ruby/object:Gem::Requirement
136
+ requirements:
137
+ - - ">="
138
+ - !ruby/object:Gem::Version
139
+ version: '0'
126
140
  description: knife-cloud plugin
127
141
  email:
128
- - dev@getchef.com
142
+ - dev@chef.io
129
143
  executables: []
130
144
  extensions: []
131
145
  extra_rdoc_files:
@@ -199,7 +213,7 @@ files:
199
213
  - spec/unit/unix_distribution_spec.rb
200
214
  - spec/unit/windows_distribution_spec.rb
201
215
  - spec/unit/winrm_bootstrap_protocol_spec.rb
202
- homepage: https://github.com/opscode/knife-cloud
216
+ homepage: https://github.com/chef/knife-cloud
203
217
  licenses: []
204
218
  metadata: {}
205
219
  post_install_message: