kitchen-cloudstack 0.21.0 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95d6263c469eb9ab6b468a9d9cacdf3a66058dca
-  data.tar.gz: f816c2ae805759fef205d006ace6594bd4072d97
+  metadata.gz: 865f50951ffac7b62e92d171f42fff075ad054f1
+  data.tar.gz: 0035d0cb62d978978cad8b4ed5627eaa37347015
 SHA512:
-  metadata.gz: 97c3f023c158a93b9d386d38f29cd6fb8e3f262902bdfd0fd1513b2ef81e8ca544a1167893447dfa2f0bee26a97d5104ed3026f519629a02e110667405623768
-  data.tar.gz: 4d273c1a715598968890cf4ef284b4138b0c077ea6dc1ecfd71cf0008fc9245c1a75328874f844585e57fefdfccb667f0c877cea1645f73ccb6d71dfcc501abb
+  metadata.gz: 3e0e41ca07d268bba030ffc40d62ecf91cbb71222498569ab0a87b6ce368a9acd3000e66b428e0506136207ae88d320695a7657b73d9279109b339fcc151b453
+  data.tar.gz: 4faa04395d32d79552ae715416e04cfdf8cbc33cf2283fe85ec282b3d25187f4ce2b6fd5c73b67a278c3fcec4bec54986d3671d69cc93f70f8b9731916445cf5

data/README.md

@@ -25,7 +25,9 @@ Provide, at a minimum, the required driver options in your `.kitchen.yml` file:
       cloudstack_expunge: [TRUE/FALSE] # Whether or not you want the instance to be expunged, default false.
       cloudstack_sync_time: [NUMBER OF SECONDS TO WAIT FOR CLOUD-SET-GUEST-PASSWORD/SSHKEY]
       keypair_search_directory: [PATH TO DIRECTORY (other than ~, ., and ~/.ssh) WITH KEYPAIR PEM FILE]
+      cloudstack_project_id: [PROJECT_ID] # To deploy VMs into project.
       cloudstack_vm_public_ip: [PUBLIC_IP] # In case you use advanced networking and do static NAT manually.
+      cloudstack_userdata: "#cloud-config\npackages:\n - htop\n" # double quote required.
 
 Then to specify different OS templates,
 

data/lib/kitchen/driver/cloudstack.rb

@@ -21,6 +21,7 @@ require 'kitchen'
 require 'fog'
 require 'socket'
 require 'openssl'
+require 'base64'
 
 module Kitchen
   module Driver
@@ -42,6 +43,7 @@ module Kitchen
           :cloudstack_host => cloudstack_uri.host,
           :cloudstack_port => cloudstack_uri.port,
           :cloudstack_path => cloudstack_uri.path,
+          :cloudstack_project_id => config[:cloudstack_project_id],
           :cloudstack_scheme => cloudstack_uri.scheme
         )
       end
@@ -57,6 +59,7 @@ module Kitchen
         options['keypair'] = config[:cloudstack_ssh_keypair_name]
         options['diskofferingid'] = config[:cloudstack_diskoffering_id]
         options['name'] = config[:host_name]
+        options[:userdata] = convert_userdata(config[:cloudstack_userdata]) if config[:cloudstack_userdata]
 
         options = sanitize(options)
 
@@ -291,6 +294,14 @@ module Kitchen
       def sanitize(options)
         options.reject { |k, v| v.nil? }
       end
+
+      def convert_userdata(user_data)
+        if user_data.match /^(?:[A-Za-z0-9+\/]{4}\n?)*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/
+          user_data
+        else
+          Base64.encode64(user_data)
+        end
+      end
     end
   end
 end

data/lib/kitchen/driver/cloudstack_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   module Driver
 
     # Version string for Cloudstack Kitchen driver
-    CLOUDSTACK_VERSION = "0.21.0"
+    CLOUDSTACK_VERSION = "0.22.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-cloudstack
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.22.0
 platform: ruby
 authors:
 - Jeff Moody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-09 00:00:00.000000000 Z
+date: 2017-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -173,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Provides an interface for Test Kitchen to be able to run jobs against an