From: hakim Date: Sat, 20 Nov 2010 19:13:08 +0000 (+0000) Subject: Merge branch 'master' of git.shadowcat.co.uk:Oyster X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=a1486321037069b15f4ba521b88c06f3bd564461;p=p5sagit%2FOyster.git Merge branch 'master' of git.shadowcat.co.uk:Oyster Conflicts: lib/Dist/Zilla/App/Command/provision.pm --- a1486321037069b15f4ba521b88c06f3bd564461 diff --cc lib/Dist/Zilla/App/Command/provision.pm index 001edad,963f9a5..7f4160a --- a/lib/Dist/Zilla/App/Command/provision.pm +++ b/lib/Dist/Zilla/App/Command/provision.pm @@@ -29,16 -28,9 +29,16 @@@ sub execute ($cfg) = values %{ $cfg->[0] }; # FIX with ::JFDI or similar my $Provision = $cfg->{Provision} or die "No section"; - my $target = $Provision->{$name} or die "No section for <$name>"; - my $type = $target->{type} || 'Rackspace'; + my @hashes = grep $_, $Provision->{Default}, $Provision->{$name} + or die "No section for <$name>, and no "; + + my %hash = @hashes > 1 ? %{ merge( @hashes ) } : $hashes[0]; + + $hash{provision_backend} = delete $hash{type} || 'Rackspace'; + $hash{pub_ssh} ||= "$ENV{HOME}/.ssh/id_rsa.pub"; - $hash{size} ||= 128; - $hash{image} ||= 'meerkat'; # TODO, should this be determined on backend? ++ $hash{size} ||= 1; # id 1 - ram 256 MiB - disk 10 GiB ++ $hash{image} ||= 69; # id 69 - Ubuntu 10.10 (meerkat) use Oyster::Provision; my $server = Oyster::Provision->new(