knife-zero 2.3.2 → 2.4.0
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.
- checksums.yaml +4 -4
- data/CHANGELOG.md +5 -0
- data/README.md +2 -2
- data/knife-zero.gemspec +1 -0
- data/lib/knife-zero/bootstrap_ssh.rb +36 -0
- data/lib/knife-zero/version.rb +1 -1
- metadata +17 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: ec45a99b4e00747009e914be5be5e53ca9ee490bbb4213ae97a9da1a585f7e51
|
4
|
+
data.tar.gz: c3750a145a402bfe5eaa96bb5fc1d0fdbcddfa0fc087cfcf25f67d46815739fc
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 12c381d16c23b23b83e7f3891d1d54e43205bdcbf034e675da43466a085999227c555b8bb76230363d3bf10490766046fd9523093faf0520fa080586447a1ba8
|
7
|
+
data.tar.gz: 6bd256d008478efec34fd27cb353fcd7712ffd2875d52875f1ef0b2944243aac31c8b7b490eb6a1cca702f02c4f2f5dc2119f4327b9dde324ddfe83ff654248d
|
data/CHANGELOG.md
CHANGED
data/README.md
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
# Knife-Plugin Zero
|
2
2
|
|
3
|
-
-
|
3
|
+
- current_main: [](https://circleci.com/gh/higanworks/knife-zero/tree/main)
|
4
4
|
- integration_with_edge_chef: [](https://circleci.com/gh/higanworks/knife-zero/tree/integration_testedge)
|
5
5
|
|
6
6
|
[](https://gitter.im/higanworks/knife-zero?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
|
@@ -17,7 +17,7 @@ Run chef-client at remote node with chef-zero(local-mode) via HTTP over SSH port
|
|
17
17
|
- [Knife-Zero Document](https://knife-zero.github.io)
|
18
18
|
- [Knife-Zero Document(Ja)](https://knife-zero.github.io/ja/)
|
19
19
|
|
20
|
-
- [CHANGELOG](https://github.com/higanworks/knife-zero/blob/
|
20
|
+
- [CHANGELOG](https://github.com/higanworks/knife-zero/blob/main/CHANGELOG.md)
|
21
21
|
|
22
22
|
## Requirements
|
23
23
|
|
data/knife-zero.gemspec
CHANGED
@@ -1,4 +1,5 @@
|
|
1
1
|
require 'chef/knife/ssh'
|
2
|
+
require 'chef/version'
|
2
3
|
|
3
4
|
class Chef
|
4
5
|
class Knife
|
@@ -9,6 +10,7 @@ class Chef
|
|
9
10
|
require 'knife-zero/helper'
|
10
11
|
end
|
11
12
|
|
13
|
+
if Gem::Version.new(Chef::VERSION) < Gem::Version.new("17.3.27")
|
12
14
|
def ssh_command(command, subsession = nil) # rubocop:disable Metrics/PerceivedComplexity, Metrics/AbcSize, Metrics/CyclomaticComplexity
|
13
15
|
if config[:client_version]
|
14
16
|
case config[:alter_project]
|
@@ -40,6 +42,40 @@ class Chef
|
|
40
42
|
ui.error e.backtrace.join("\n")
|
41
43
|
exit 1
|
42
44
|
end
|
45
|
+
else
|
46
|
+
# def ssh_command(command, subsession = nil) # rubocop:disable Metrics/PerceivedComplexity, Metrics/AbcSize, Metrics/CyclomaticComplexity
|
47
|
+
def ssh_command(command, session_list = session) # rubocop:disable Metrics/PerceivedComplexity, Metrics/AbcSize, Metrics/CyclomaticComplexity
|
48
|
+
if config[:client_version]
|
49
|
+
case config[:alter_project]
|
50
|
+
when 'cinc'
|
51
|
+
super(%{/opt/cinc/embedded/bin/ruby -ropen-uri -e 'puts open("https://omnitruck.cinc.sh/install.sh").read' | sudo sh -s -- -v #{config[:client_version]}})
|
52
|
+
else
|
53
|
+
super(%{/opt/chef/embedded/bin/ruby -ropen-uri -e 'puts open("https://omnitruck.chef.io/chef/install.sh").read' | sudo sh -s -- -v #{config[:client_version]}})
|
54
|
+
end
|
55
|
+
end
|
56
|
+
|
57
|
+
if config[:json_attribs]
|
58
|
+
Chef::Log.info "Onetime Attributes: #{config[:chef_client_json]}"
|
59
|
+
super(build_client_json)
|
60
|
+
end
|
61
|
+
|
62
|
+
chef_zero_port = config[:chef_zero_port] ||
|
63
|
+
Chef::Config[:knife][:chef_zero_port] ||
|
64
|
+
URI.parse(Chef::Config.chef_server_url).port
|
65
|
+
chef_zero_host = config[:chef_zero_host] ||
|
66
|
+
Chef::Config[:knife][:chef_zero_host] ||
|
67
|
+
'127.0.0.1'
|
68
|
+
session_list.servers.each do |server|
|
69
|
+
session = server.session(true)
|
70
|
+
session.forward.remote(chef_zero_port, chef_zero_host, ::Knife::Zero::Helper.zero_remote_port)
|
71
|
+
end
|
72
|
+
super
|
73
|
+
rescue => e # rubocop:disable Style/RescueStandardError
|
74
|
+
ui.error(e.class.to_s + e.message)
|
75
|
+
ui.error e.backtrace.join("\n")
|
76
|
+
exit 1
|
77
|
+
end
|
78
|
+
end
|
43
79
|
|
44
80
|
def build_client_json
|
45
81
|
<<-SCRIPT
|
data/lib/knife-zero/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: knife-zero
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.
|
4
|
+
version: 2.4.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- sawanoboly
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2021-07-13 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|
@@ -150,6 +150,20 @@ dependencies:
|
|
150
150
|
- - ">="
|
151
151
|
- !ruby/object:Gem::Version
|
152
152
|
version: '15.0'
|
153
|
+
- !ruby/object:Gem::Dependency
|
154
|
+
name: knife
|
155
|
+
requirement: !ruby/object:Gem::Requirement
|
156
|
+
requirements:
|
157
|
+
- - ">="
|
158
|
+
- !ruby/object:Gem::Version
|
159
|
+
version: '17.0'
|
160
|
+
type: :runtime
|
161
|
+
prerelease: false
|
162
|
+
version_requirements: !ruby/object:Gem::Requirement
|
163
|
+
requirements:
|
164
|
+
- - ">="
|
165
|
+
- !ruby/object:Gem::Version
|
166
|
+
version: '17.0'
|
153
167
|
description: Run chef-client at remote node with chef-zero(local-mode) via HTTP over
|
154
168
|
SSH port fowarding.
|
155
169
|
email:
|
@@ -192,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
192
206
|
- !ruby/object:Gem::Version
|
193
207
|
version: '0'
|
194
208
|
requirements: []
|
195
|
-
rubygems_version: 3.
|
209
|
+
rubygems_version: 3.2.22
|
196
210
|
signing_key:
|
197
211
|
specification_version: 4
|
198
212
|
summary: Run chef-client at remote node with chef-zero(local-mode) via HTTP over SSH
|