kitchen-vz 0.1.1 → 0.1.2

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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 2b13e71aada0ac01d7ee5f9077b7f89b7b18571f
4
- data.tar.gz: bb56d5a8c0cc50786c35a1ac4f08a18e5a14fd31
3
+ metadata.gz: 7bf73d0a9618e839b979290bc316e954e599ad2b
4
+ data.tar.gz: 60bbface59b54d4d90f38fc90369b96445f89909
5
5
  SHA512:
6
- metadata.gz: 12d852135052285afaed5a80de8e89a1b27e83ba3fba2faa93f0312d1248a12ebfb0e32d6891a6f1f0dfe9cef76fe03d31d43b54248e67cc2d0202847e92c921
7
- data.tar.gz: 3689b273994d03191a114e6c6a4a7ab3b476a1aeceb36adf2fe49dadb2ee02a9544b96a6cad72ff6ac45b3a7d495486cc19951fedef9ac22614a15c69068fe49
6
+ metadata.gz: 8b8028692e37e9b830428025296864564e449b6a3e1a53012d20836eb10563081e7ef5721f68abc5a1478e5abacca714dae2ecfffbbbda8bae9a8ce313946eb8
7
+ data.tar.gz: 2a2ac99562a167204b59acd3868ce45a391b67da9adec9c15572dc2ed59a6527133658ec2f4c83bd70ab431823b278b7a16678b83f42f308c398d9d0718462dd
@@ -43,6 +43,7 @@ module Kitchen
43
43
  end
44
44
 
45
45
  def create(state)
46
+ return if state[:ct_id]
46
47
  state[:ct_id] = SecureRandom.uuid
47
48
  generate_keys
48
49
  state[:ssh_key] = config[:ssh_key] = config[:private_key]
@@ -75,7 +76,7 @@ module Kitchen
75
76
  def generate_keys
76
77
  if !File.exist?(config[:public_key]) || !File.exist?(config[:private_key])
77
78
  private_key = OpenSSL::PKey::RSA.new(2048)
78
- blobbed_key = Base64.encode64(private_key.to_blob)
79
+ blobbed_key = Base64.encode64(private_key.to_blob).gsub("\n", '')
79
80
  public_key = "ssh-rsa #{blobbed_key} kitchen_key"
80
81
  File.open(config[:private_key], 'w') do |file|
81
82
  file.write(private_key)
@@ -135,6 +136,7 @@ module Kitchen
135
136
  "chown #{config[:username]}: /home/#{config[:username]}/.ssh/authorized_keys",
136
137
  "chmod 600 /home/#{config[:username]}/.ssh/authorized_keys",
137
138
  'mkdir -p /etc/sudoers.d',
139
+ "echo '#includedir /etc/sudoers.d' >> /etc/sudoers",
138
140
  "echo '#{config[:username]} ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers.d/#{config[:username]}",
139
141
  "chmod 0440 /etc/sudoers.d/#{config[:username]}"].each do |command|
140
142
  execute_command("#{prlctl} exec #{state[:ct_id]} \"#{command}\"")
@@ -143,7 +145,7 @@ module Kitchen
143
145
 
144
146
  def ct_ip(state)
145
147
  ip = nil
146
- 1..10.times do
148
+ 1..30.times do
147
149
  output = execute_command("#{vzctl} exec #{state[:ct_id]} \"/sbin/ip -o -f inet addr show dev eth0\"")
148
150
  result = %r{(([0-9]{1,3}\.){3}[0-9]{1,3})\/[0-9]{1,2}}.match(output)
149
151
  ip = result[1] if result
@@ -19,6 +19,6 @@
19
19
  module Kitchen
20
20
  module Driver
21
21
  # Version string for Vz Kitchen driver
22
- VZ_VERSION = '0.1.1'.freeze
22
+ VZ_VERSION = '0.1.2'.freeze
23
23
  end
24
24
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: kitchen-vz
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.1
4
+ version: 0.1.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Pavel Yudin
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-03-15 00:00:00.000000000 Z
11
+ date: 2016-06-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: test-kitchen
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
119
119
  version: '0'
120
120
  requirements: []
121
121
  rubyforge_project:
122
- rubygems_version: 2.0.14
122
+ rubygems_version: 2.6.4
123
123
  signing_key:
124
124
  specification_version: 4
125
125
  summary: A Virtuozzo driver for Test Kitchen