rubber 1.12.1 → 1.12.2
Sign up to get free protection for your applications and to get access to all the features.
- data/CHANGELOG +8 -0
- data/VERSION +1 -1
- data/generators/vulcanize/templates/base/config/rubber/rubber.yml +3 -3
- data/lib/generators/vulcanize/templates/base/config/rubber/rubber.yml +3 -3
- data/lib/rubber/recipes/rubber/security_groups.rb +10 -8
- data/lib/rubber/recipes/rubber/setup.rb +12 -19
- metadata +2 -2
data/CHANGELOG
CHANGED
@@ -1,3 +1,11 @@
|
|
1
|
+
1.12.2
|
2
|
+
-----
|
3
|
+
|
4
|
+
improve commit filter for changelog <6298227> [Matt Conway]
|
5
|
+
don't delete security groups when answer is negative <fbba5de> [Matt Conway]
|
6
|
+
fix enabling root user for create/refresh with multiple instances <db5a227> [Matt Conway]
|
7
|
+
latest stable ami <84da0eb> [Matt Conway]
|
8
|
+
|
1
9
|
1.12.1
|
2
10
|
-----
|
3
11
|
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
1.12.
|
1
|
+
1.12.2
|
@@ -75,12 +75,12 @@ cloud_providers:
|
|
75
75
|
|
76
76
|
# REQUIRED: the ami and instance type for creating instances
|
77
77
|
# The Ubuntu images at http://alestic.com/ work well
|
78
|
-
# Ubuntu 10.04 Lucid base install 32-bit ami-
|
79
|
-
# Ubuntu 10.04 Lucid base install 64-bit ami-
|
78
|
+
# Ubuntu 10.04 Lucid base install 32-bit ami-7000f019
|
79
|
+
# Ubuntu 10.04 Lucid base install 64-bit ami-fa01f193
|
80
80
|
#
|
81
81
|
# m1.small or m1.large or m1.xlarge
|
82
82
|
image_type: m1.small
|
83
|
-
image_id: "#{ %w{m1.small c1.medium}.include?(image_type) ? 'ami-
|
83
|
+
image_id: "#{ %w{m1.small c1.medium}.include?(image_type) ? 'ami-7000f019' : 'ami-fa01f193' }"
|
84
84
|
|
85
85
|
# OPTIONAL: EC2 spot instance request support.
|
86
86
|
#
|
@@ -75,12 +75,12 @@ cloud_providers:
|
|
75
75
|
|
76
76
|
# REQUIRED: the ami and instance type for creating instances
|
77
77
|
# The Ubuntu images at http://alestic.com/ work well
|
78
|
-
# Ubuntu 10.04 Lucid base install 32-bit ami-
|
79
|
-
# Ubuntu 10.04 Lucid base install 64-bit ami-
|
78
|
+
# Ubuntu 10.04 Lucid base install 32-bit ami-7000f019
|
79
|
+
# Ubuntu 10.04 Lucid base install 64-bit ami-fa01f193
|
80
80
|
#
|
81
81
|
# m1.small or m1.large or m1.xlarge
|
82
82
|
image_type: m1.small
|
83
|
-
image_id: "#{ %w{m1.small c1.medium}.include?(image_type) ? 'ami-
|
83
|
+
image_id: "#{ %w{m1.small c1.medium}.include?(image_type) ? 'ami-7000f019' : 'ami-fa01f193' }"
|
84
84
|
|
85
85
|
# OPTIONAL: EC2 spot instance request support.
|
86
86
|
#
|
@@ -141,14 +141,16 @@ namespace :rubber do
|
|
141
141
|
else
|
142
142
|
logger.info(msg)
|
143
143
|
end
|
144
|
-
|
145
|
-
|
146
|
-
|
147
|
-
|
148
|
-
|
149
|
-
|
150
|
-
|
151
|
-
|
144
|
+
|
145
|
+
if answer =~ /^y/
|
146
|
+
rule_map = Rubber::Util::symbolize_keys(rule_map)
|
147
|
+
if rule_map[:source_group_name]
|
148
|
+
cloud.remove_security_group_rule(group_name, nil, nil, nil, {:name => rule_map[:source_group_name], :account => rule_map[:source_group_account]})
|
149
|
+
else
|
150
|
+
rule_map[:source_ips].each do |source_ip|
|
151
|
+
cloud.remove_security_group_rule(group_name, rule_map[:protocol], rule_map[:from_port], rule_map[:to_port], source_ip)
|
152
|
+
end if rule_map[:source_ips]
|
153
|
+
end
|
152
154
|
end
|
153
155
|
end
|
154
156
|
end
|
@@ -17,29 +17,22 @@ namespace :rubber do
|
|
17
17
|
|
18
18
|
# Sets up instance to allow root access (e.g. recent canonical AMIs)
|
19
19
|
def enable_root_ssh(ip, initial_ssh_user)
|
20
|
-
old_user = user
|
21
|
-
begin
|
22
|
-
set :user, initial_ssh_user
|
23
20
|
|
24
|
-
|
25
|
-
|
26
|
-
|
21
|
+
task :_allow_root_ssh, :hosts => "#{initial_ssh_user}@#{ip}" do
|
22
|
+
rsudo "cp /home/#{initial_ssh_user}/.ssh/authorized_keys /root/.ssh/"
|
23
|
+
end
|
27
24
|
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
end
|
25
|
+
begin
|
26
|
+
_allow_root_ssh
|
27
|
+
rescue ConnectionError => e
|
28
|
+
if e.message =~ /Net::SSH::AuthenticationFailed/
|
29
|
+
logger.info "Can't connect as user #{initial_ssh_user} to #{ip}, assuming root allowed"
|
30
|
+
else
|
31
|
+
sleep 2
|
32
|
+
logger.info "Failed to connect to #{ip}, retrying"
|
33
|
+
retry
|
38
34
|
end
|
39
|
-
ensure
|
40
|
-
set :user, old_user
|
41
35
|
end
|
42
|
-
|
43
36
|
end
|
44
37
|
|
45
38
|
# Forces a direct connection
|
metadata
CHANGED
@@ -2,7 +2,7 @@
|
|
2
2
|
name: rubber
|
3
3
|
version: !ruby/object:Gem::Version
|
4
4
|
prerelease:
|
5
|
-
version: 1.12.
|
5
|
+
version: 1.12.2
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
8
8
|
- Matt Conway
|
@@ -10,7 +10,7 @@ autorequire:
|
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
12
|
|
13
|
-
date: 2011-03-
|
13
|
+
date: 2011-03-31 00:00:00 -04:00
|
14
14
|
default_executable: vulcanize
|
15
15
|
dependencies:
|
16
16
|
- !ruby/object:Gem::Dependency
|