vagrant-1cloud 1.0.5 → 1.0.6
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:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 527d0b3d1a22da60dd48e3c40e88177a4fa1f268
|
4
|
+
data.tar.gz: d50ab4ddcda809431bcc5604dda0a00cd3171bad
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 35232a737a9208e98a912aec36e0149df696bf651620431124e476f59646c4afd3ac5e478e20671ad3723f09eb8ca029cf71450d1eda6095936e5765bccbca41
|
7
|
+
data.tar.gz: 7da1648766fafd951d60a44902ac11ed7891b0c17828b04b7c9279e350530fbb214fd26ad9890034bad4954b5c5549772c92b85ed123f7a18d0c8f1877526516
|
@@ -44,9 +44,10 @@ module VagrantPlugins
|
|
44
44
|
path = File.expand_path(path, @machine.env.root_path)
|
45
45
|
pub_key = OneCloud.public_key(path)
|
46
46
|
Net::SSH.start(droplet['IP'], droplet['AdminUserName'], :password => droplet['AdminPassword']) do |ssh|
|
47
|
-
ssh.exec!("mkdir ~/.ssh")
|
47
|
+
ssh.exec!("mkdir -p ~/.ssh")
|
48
48
|
ssh.exec!("touch ~/.ssh/authorized_keys")
|
49
49
|
ssh.exec!("echo \"#{pub_key}\" >> ~/.ssh/authorized_keys")
|
50
|
+
ssh.exec!("chmod 600 ~/.ssh/authorized_keys")
|
50
51
|
end
|
51
52
|
|
52
53
|
user = @machine.config.ssh.username
|
@@ -23,7 +23,7 @@ module VagrantPlugins
|
|
23
23
|
lockfile = "/tmp/" + net.to_s + ".lock"
|
24
24
|
f = File.open(lockfile, "w+")
|
25
25
|
|
26
|
-
retryable(:tries =>
|
26
|
+
retryable(:tries => 400, :sleep => 10) do
|
27
27
|
next if env[:interrupted]
|
28
28
|
raise 'Problem with lockfile' if check_file_locked?(lockfile)
|
29
29
|
end
|
@@ -47,11 +47,10 @@ module VagrantPlugins
|
|
47
47
|
path = File.expand_path(path, @machine.env.root_path)
|
48
48
|
pub_key = OneCloud.public_key(path)
|
49
49
|
@machine.communicate.execute(<<-BASH)
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
chown -R #{user} /home/#{user}/.ssh;
|
50
|
+
touch /home/#{user}/.ssh/authorized_keys
|
51
|
+
echo \"#{pub_key}\" >> /home/#{user}/.ssh/authorized_keys
|
52
|
+
chown -R #{user} /home/#{user}/.ssh
|
53
|
+
chmod 600 /home/#{user}/.ssh/authorized_keys
|
55
54
|
BASH
|
56
55
|
|
57
56
|
# reset username
|
@@ -80,7 +80,7 @@ module VagrantPlugins
|
|
80
80
|
end
|
81
81
|
|
82
82
|
def wait_for_event(env, m_id, id)
|
83
|
-
retryable(:tries =>
|
83
|
+
retryable(:tries => 400, :sleep => 10) do
|
84
84
|
# stop waiting if interrupted
|
85
85
|
next if env[:interrupted]
|
86
86
|
|
@@ -93,7 +93,7 @@ module VagrantPlugins
|
|
93
93
|
end
|
94
94
|
|
95
95
|
def wait_for_network(env, net_id)
|
96
|
-
retryable(:tries =>
|
96
|
+
retryable(:tries => 400, :sleep => 10) do
|
97
97
|
# stop waiting if interrupted
|
98
98
|
next if env[:interrupted]
|
99
99
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: vagrant-1cloud
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.0.
|
4
|
+
version: 1.0.6
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Bulat Yusupov
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2017-05-
|
11
|
+
date: 2017-05-11 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: faraday
|