testbeat 0.6.0.pr6 → 0.6.0.pr7
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/lib/vagrant/noderunner.rb +6 -8
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 63c10ebbb4a663d224884263bab1aef77f34bd6c
|
|
4
|
+
data.tar.gz: e3d7fa708a61c9c833f36ecec770bf4976a0143c
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 96a7de7c0c50a6a626262ea05ec44f649a6852234fb3b47947a5ed755bfd26984d98d5bde25656fd6c07df819d1a72a9fac043dc1588315d8413917734ce9610
|
|
7
|
+
data.tar.gz: 73e24a10caf28846411a824edae177db1ba337aaadd9ca1c510d18c6d53cb6866836767b48c66702b0a208d11ff140ac726956726b4228896d361235546b7614
|
data/lib/vagrant/noderunner.rb
CHANGED
|
@@ -14,6 +14,10 @@ def get_hostname(node: $node, vagrant_dir: $vagrant_dir)
|
|
|
14
14
|
cmd_hostname = "vagrant ssh-config | grep HostName | sed 's/ *HostName *//'"
|
|
15
15
|
hostname = Open3.popen3("cd #{ vagrant_dir + node }; #{cmd_hostname}") { |stdin, stdout, stderr, wait_thr| stdout.read }
|
|
16
16
|
hostname = hostname.chomp
|
|
17
|
+
if hostname =~ /^\d+\.\d+\.\d+\.\d+$/
|
|
18
|
+
puts "SSH hostname is an IP, #{hostname}, using node name instead as FQDN"
|
|
19
|
+
hostname = $node
|
|
20
|
+
end
|
|
17
21
|
puts "Vagrant node hostname: #{hostname}"
|
|
18
22
|
return hostname
|
|
19
23
|
end
|
|
@@ -207,10 +211,7 @@ def main(node: "labs01", provider: "virtualbox", retest: false, guestint: true,
|
|
|
207
211
|
vagrant_cmd = cwd_to_node + "vagrant up --provider=#{provider}"
|
|
208
212
|
elsif /running/.match(v_status)
|
|
209
213
|
# Add "if runlist file older than 1 h, assume force_long"
|
|
210
|
-
hostname =
|
|
211
|
-
if provider == "aws"
|
|
212
|
-
hostname = get_hostname()
|
|
213
|
-
end
|
|
214
|
+
hostname = get_hostname()
|
|
214
215
|
if retest and File.exists?(runlist_file)
|
|
215
216
|
old_run = File.read(runlist_file)
|
|
216
217
|
#run_match = /Run List expands to \[(.*?)\]/.match(old_run)
|
|
@@ -276,10 +277,7 @@ def main(node: "labs01", provider: "virtualbox", retest: false, guestint: true,
|
|
|
276
277
|
exit 1
|
|
277
278
|
else
|
|
278
279
|
puts "Vagrant provision completed."
|
|
279
|
-
hostname =
|
|
280
|
-
if provider == "aws"
|
|
281
|
-
hostname = get_hostname()
|
|
282
|
-
end
|
|
280
|
+
hostname = get_hostname()
|
|
283
281
|
|
|
284
282
|
# Run List expands to [repos-channel::haproxy, cms-base::folderstructure, repos-apache2, repos-subversion, repos-rweb, repos-trac, repos-liveserver, repos-indexing, repos-snapshot, repos-vagrant-labs]
|
|
285
283
|
run_match = /Run List expands to \[(.*?)\]/.match(vagrant_run_output)
|