kotovalexarian-likes-github/fog--fog
1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00
Code Releases Activity

fixes to make bootstrap play nicer, especially outside the bin/fog context

Browse source
This commit is contained in:
geemus 2010-10-20 14:32:30 -07:00
parent 398d9bc400
commit 4c8c25f361
7 changed files with 45 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/fog.rb
View file

@ -52,6 +52,10 @@ module Fog
@bin = new_bin
end
def self.credentials
{}
end
def self.mock!
@mocking = true
end

22
lib/fog/aws/models/compute/server.rb
View file

@ -104,20 +104,23 @@ module Fog
end
def private_key_path
File.expand_path(@private_key_path ||= Fog.credentials[:private_key_path])
@private_key_path ||= Fog.credentials[:private_key_path]
@private_key_path &&= File.expand_path(@private_key_path)
end
def private_key
@private_key ||= File.read(private_key_path)
@private_key ||= private_key_path && File.read(private_key_path)
end
def public_key_path
File.expand_path(@public_key_path ||= Fog.credentials[:public_key_path])
@public_key_path ||= Fog.credentials[:public_key_path]
@public_key_path &&= File.expand_path(@public_key_path)
end
def public_key
@public_key ||= File.read(public_key_path)
@public_key ||= public_key_path && File.read(public_key_path)
end
def ready?
@state == 'running'
end
@ -161,14 +164,17 @@ module Fog
end
def setup(credentials = {})
requires :identity, :ip_address, :public_key, :username
requires :identity, :ip_address, :username
sleep(10) # takes a bit before EC2 instances will play nice
Fog::SSH.new(ip_address, username, credentials).run([
commands = [
%{mkdir .ssh},
%{echo "#{public_key}" >> ~/.ssh/authorized_keys},
%{passwd -l root},
%{echo "#{attributes.to_json}" >> ~/attributes.json}
])
]
if public_key
commands << %{echo "#{public_key}" >> ~/.ssh/authorized_keys}
end
Fog::SSH.new(ip_address, username, credentials).run(commands)
rescue Errno::ECONNREFUSED => e
sleep(1)
retry

14
lib/fog/aws/models/compute/servers.rb
View file

@ -37,13 +37,15 @@ module Fog
def bootstrap(new_attributes = {})
server = connection.servers.new(new_attributes)
# first or create fog_#{credential} keypair
unless server.key_pair = connection.key_pairs.get("fog_#{Fog.credential}")
unless new_attributes[:key_name]
# first or create fog_#{credential} keypair
name = Fog.respond_to?(:credential) && Fog.credential || :default
server.key_pair = connection.key_pairs.create(
:name => "fog_#{name}",
:public_key => server.public_key
)
unless server.key_pair = connection.key_pairs.get("fog_#{name}")
server.key_pair = connection.key_pairs.create(
:name => "fog_#{name}",
:public_key => server.public_key
)
end
end
# make sure port 22 is open in the first security group

10
lib/fog/bluebox/models/compute/server.rb
View file

@ -51,19 +51,21 @@ module Fog
end
def private_key_path
File.expand_path(@private_key_path ||= Fog.credentials[:private_key_path])
@private_key_path ||= Fog.credentials[:private_key_path]
@private_key_path &&= File.expand_path(@private_key_path)
end
def private_key
@private_key ||= File.read(private_key_path)
@private_key ||= private_key_path && File.read(private_key_path)
end
def public_key_path
File.expand_path(@public_key_path ||= Fog.credentials[:public_key_path])
@public_key_path ||= Fog.credentials[:public_key_path]
@public_key_path &&= File.expand_path(@public_key_path)
end
def public_key
@public_key ||= File.read(public_key_path)
@public_key ||= public_key_path && File.read(public_key_path)
end
def ready?

1
lib/fog/core/credentials.rb
View file

@ -15,6 +15,7 @@ module Fog
ENV["FOG_RC"] || '~/.fog'
end
remove_method :credentials
def credentials
@credentials ||= begin
path = File.expand_path(config_path)

10
lib/fog/rackspace/models/compute/server.rb
View file

@ -48,19 +48,21 @@ module Fog
end
def private_key_path
File.expand_path(@private_key_path ||= Fog.credentials[:private_key_path])
@private_key_path ||= Fog.credentials[:private_key_path]
@private_key_path &&= File.expand_path(@private_key_path)
end
def private_key
@private_key ||= File.read(private_key_path)
@private_key ||= private_key_path && File.read(private_key_path)
end
def public_key_path
File.expand_path(@public_key_path ||= Fog.credentials[:public_key_path])
@public_key_path ||= Fog.credentials[:public_key_path]
@public_key_path &&= File.expand_path(@public_key_path)
end
def public_key
@public_key ||= File.read(public_key_path)
@public_key ||= public_key_path && File.read(public_key_path)
end
def ready?

10
lib/fog/slicehost/models/compute/server.rb
View file

@ -44,19 +44,21 @@ module Fog
end
def private_key_path
File.expand_path(@private_key_path ||= Fog.credentials[:private_key_path])
@private_key_path ||= Fog.credentials[:private_key_path]
@private_key_path &&= File.expand_path(@private_key_path)
end
def private_key
@private_key ||= File.read(private_key_path)
@private_key ||= private_key_path && File.read(private_key_path)
end
def public_key_path
File.expand_path(@public_key_path ||= Fog.credentials[:public_key_path])
@public_key_path ||= Fog.credentials[:public_key_path]
@public_key_path &&= File.expand_path(@public_key_path)
end
def public_key
@public_key ||= File.read(public_key_path)
@public_key ||= public_key_path && File.read(public_key_path)
end
def ready?