mccloud 0.0.16 → 0.0.17

data/README.md

@@ -85,11 +85,13 @@ The syntax to use for an ec2
     Mccloud::Config.run do |config|
 
       # Define a :aws provider 'aws-us-east'
-      config.provider.define "host-provider" do |provider_config|
+      config.provider.define "aws-us-east" do |provider_config|
 
         #Note: this are option provided to fog for creation
         provider_config.provider.options = { }
 
+        provider_config.provider.flavor = :aws
+
         # Region in which to create the VM
         provider_config.provider.region = "us-east-1"
 
@@ -171,7 +173,7 @@ this works together with veewee that support creating kvm template machines.
 Like on vagrant, mccloud clones a veewee created vm 
 
     config.provider.define "kvm-libvirt" do |config|
-      config.provider.type=:libvirt
+      config.provider.flavor=:libvirt
       config.provider.options={ :libvirt_uri => "qemu+ssh://ubuntu@kvmbox/system" }
       config.provider.namespace="test"
     end

data/lib/mccloud/provider/aws/vm/scp.rb

@@ -6,16 +6,25 @@ module Mccloud::Provider
         scp(src,dest,options)
       end
 
-       def scp(local_path, remote_path, scp_options = {})
-         unless File.exists?(local_path)
+      def scp(local_path, remote_path, scp_options = {})
+        unless File.exists?(local_path)
           raise Mccloud::Error,"scp failed: #{local_path} does not exist"
-         end
-         #@raw.scp(src,dest)
-         scp_options[:key_data] = [@raw.private_key] if @raw.private_key
+        end
 
-         ::Fog::SCP.new(self.ip_address, @raw.username, scp_options).upload(local_path, remote_path, {})
+        #@raw.scp(src,dest)
+        scp_options[:key_data] = [@raw.private_key] if @raw.private_key
+
+        ::Fog::SCP.new(self.ip_address, @raw.username, sanitize(scp_options)).upload(local_path, remote_path, {})
+      end
+
+      #
+      # sanitize the options by converting to a hash with
+      # all keys converted to symbols as required by net/ssh
+      #
+      def sanitize(options)
+        Hash[options.map{|(k,v)| [k.to_sym,v]}]
       end
 
-       end #module
-      end #module
     end #module
+  end #module
+end #module

data/lib/mccloud/version.rb

@@ -2,5 +2,5 @@ module Mccloud
 end
 
 unless defined?(Mccloud::VERSION)
-  ::Mccloud::VERSION = "0.0.16"
+  ::Mccloud::VERSION = "0.0.17"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mccloud
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: 
   segments: 
   - 0
   - 0
-  - 16
-  version: 0.0.16
+  - 17
+  version: 0.0.17
 platform: ruby
 authors: 
 - Patrick Debois