vagrant-cloudstack 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f71a9d5b05706c2e193708960acdcf57c0ac719
-  data.tar.gz: 9551a14cae770c185ccec397d44bdf28e6267122
+  metadata.gz: d8a5fb6d4705653f7d21a743fefd04d85835221b
+  data.tar.gz: 11f800be47556f82ee523d4f2b8d922ff43282f7
 SHA512:
-  metadata.gz: f7179025213a3050fa790e881e675c697df1db2e0529f7bed0acb3b65ffbc071c7f5ef3d9f4ebcbb7c4817b9e1bcccc59e12f0a9f6daf69e1fb295a4832f76f7
-  data.tar.gz: d25a50cfdc056d833b71a89a59eb13e5da47355b7def7cb43567595309749ec56545e896a5b15a3d03d7c283f308b79b9caf2db9413ab60e76cef9d8028dfee8
+  metadata.gz: aa716e9e7f67ecf57162a41b4bf22618059a5434fc6150c9774c3123a505b7cc99cfe24202e3a92bab295737120c265b0a42de0a6e221e4bd3ed70ac56ab9117
+  data.tar.gz: ac00112e1d8d52bbe1869e2357e306c33657095612b7db86362cefaaa8cae62e204313d4ca4274952d9d5f44efe8aa517b4866a34e70587af89fcc0db92d117a

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+# 0.5.0 (Apr 29, 2014)
+
+* Use latest version of upstream fog which contains some much needed
+  improvements to the Cloudstack support. Closes #10 for example.
+
+# 0.4.3 (Apr 15, 2014)
+
+* Update README to reflect Vagrant version needed
+
+# 0.4.2 (Apr 15, 2014)
+
+* Add support for userdata
+
+# 0.4.1 (Apr 14, 2014)
+
+* Add support for cygwin paths
+
 # 0.4.0 (Mar 30, 2014)
 
 * Fix for Vagrant > =1.5 [GH-29]

data/Gemfile

@@ -8,3 +8,6 @@ group :development do
   # Vagrant environment itself using `vagrant plugin`.
   gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git"
 end
+
+gem 'coveralls', require: false
+

data/README.md

@@ -3,13 +3,15 @@
 [![Build Status](https://travis-ci.org/klarna/vagrant-cloudstack.png?branch=master)](https://travis-ci.org/klarna/vagrant-cloudstack)
 [![Gem Version](https://badge.fury.io/rb/vagrant-cloudstack.png)](http://badge.fury.io/rb/vagrant-cloudstack)
 [![Dependency Status](https://gemnasium.com/klarna/vagrant-cloudstack.png)](https://gemnasium.com/klarna/vagrant-cloudstack)
+[![Code climate](https://codeclimate.com/github/klarna/vagrant-cloudstack.png)](https://codeclimate.com/github/klarna/vagrant-cloudstac)
+[![Coverage Status](https://coveralls.io/repos/klarna/vagrant-cloudstack/badge.png)](https://coveralls.io/r/klarna/vagrant-cloudstack)
 
 This is a fork of [mitchellh AWS Provider](https://github.com/mitchellh/vagrant-aws/).
 
 This is a [Vagrant](http://www.vagrantup.com) 1.2+ plugin that adds an [Cloudstack](http://cloudstack.apache.org)
 provider to Vagrant.
 
-**NOTE:** This plugin requires Vagrant 1.2+,
+**NOTE:** This plugin requires Vagrant 1.5+, since v0.4.0.
 
 ## Features
 
@@ -178,6 +180,26 @@ the remote machine over SSH.
 This is good enough for all built-in Vagrant provisioners (shell,
 chef, and puppet) to work!
 
+### User data
+
+You can specify user data for the instance being booted.
+
+```ruby
+Vagrant.configure("2") do |config|
+  # ... other stuff
+
+  config.vm.provider :cloudstack do |cloudstack|
+    # Option 1: a single string
+    cloudstack.user_data = "#!/bin/bash\necho 'got user data' > /tmp/user_data.log\necho"
+
+    # Option 2: use a file
+    cloudstack.user_data = File.read("user_data.txt")
+  end
+end
+```
+
+The maximum length of user_data is around 1500 bytes with Cloudstack API < 4.2 ( base64 encoded user_data must be < 2048 bytes)
+
 ## Development
 
 To work on the `vagrant-cloudstack` plugin, clone this repository out, and use

data/build_rpm.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-VERSION=0.4.0
+VERSION=0.5.0
 mkdir -p /tmp/vagrant-cloudstack-build_rpm.$$/vagrant-cloudstack-$VERSION
 cp -r . /tmp/vagrant-cloudstack-build_rpm.$$/vagrant-cloudstack-$VERSION/
 tar -C /tmp/vagrant-cloudstack-build_rpm.$$/ -czf ~/rpmbuild/SOURCES/vagrant-cloudstack-$VERSION.tar.gz vagrant-cloudstack-$VERSION

data/lib/vagrant-cloudstack/action/run_instance.rb

@@ -42,6 +42,7 @@ module VagrantPlugins
           security_group_ids    = domain_config.security_group_ids
           security_group_names  = domain_config.security_group_names
           security_groups       = domain_config.security_groups
+          user_data             = domain_config.user_data
 
           # If there is no keypair then warn the user
           if !keypair
@@ -85,6 +86,7 @@ module VagrantPlugins
           env[:ui].info(" -- Zone UUID: #{zone_id}")
           env[:ui].info(" -- Network UUID: #{network_id}") if network_id
           env[:ui].info(" -- Keypair: #{keypair}") if keypair
+          env[:ui].info(" -- User Data: Yes") if user_data
           if !security_group_ids.nil?
             security_group_ids.each do |security_group_id|
               env[:ui].info(" -- Security Group ID: #{security_group_id}")
@@ -175,6 +177,14 @@ module VagrantPlugins
             options['project_id'] = project_id if project_id != nil
             options['key_name'] = keypair if keypair != nil
 
+            if user_data != nil
+              options['user_data'] = Base64.encode64(user_data)
+              if options['user_data'].length > 2048
+                raise Errors::UserdataError,
+                  :userdataLength => options['user_data'].length
+              end
+            end
+
             server = env[:cloudstack_compute].servers.create(options)
           rescue Fog::Compute::Cloudstack::NotFound => e
             # Invalid subnet doesn't have its own error so we catch and

data/lib/vagrant-cloudstack/config.rb

@@ -123,6 +123,12 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :group
 
+      # The user data string
+      #
+      # @return [String]
+      attr_accessor :user_data
+      
+
       def initialize(domain_specific=false)
         @host                   = UNSET_VALUE
         @path                   = UNSET_VALUE
@@ -147,6 +153,8 @@ module VagrantPlugins
         @group                  = UNSET_VALUE
         @security_group_names   = UNSET_VALUE
         @security_groups        = UNSET_VALUE
+        @user_data              = UNSET_VALUE
+
 
         # Internal state (prefix with __ so they aren't automatically
         # merged)
@@ -286,6 +294,9 @@ module VagrantPlugins
         # Group must be nil, since we can't default that
         @group = nil if @group == UNSET_VALUE
 
+        # User Data is nil by default
+        @user_data = nil if @user_data == UNSET_VALUE
+
         # Compile our domain specific configurations only within
         # NON-DOMAIN-SPECIFIC configurations.
         if !@__domain_specific

data/lib/vagrant-cloudstack/errors.rb

@@ -18,6 +18,10 @@ module VagrantPlugins
       class RsyncError < VagrantCloudstackError
         error_key(:rsync_error)
       end
+
+      class UserdataError < VagrantCloudstackError
+        error_key(:user_data_error)
+      end
     end
   end
 end

data/lib/vagrant-cloudstack/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Cloudstack
-    VERSION = "0.4.1"
+    VERSION = "0.5.0"
   end
 end

data/locales/en.yml

@@ -69,6 +69,8 @@ en:
         Host path: %{hostpath}
         Guest path: %{guestpath}
         Error: %{stderr}
+      user_data_error: |-
+        The base64 encoded user data length (%{userdataLength}) is greater than 2048.
 
     states:
       short_not_created: |-

data/spec/vagrant-cloudstack/config_spec.rb

@@ -1,5 +1,8 @@
 require "vagrant-cloudstack/config"
 
+require 'coveralls'
+Coveralls.wear!
+
 describe VagrantPlugins::Cloudstack::Config do
   let(:instance) { described_class.new }
 
@@ -37,6 +40,7 @@ describe VagrantPlugins::Cloudstack::Config do
     its("group")                  { should be_nil }
     its("security_group_names")   { should be_nil }
     its("security_groups")        { should be_nil }
+    its("user_data")              { should be_nil }
   end
 
   describe "overriding defaults" do
@@ -46,7 +50,7 @@ describe VagrantPlugins::Cloudstack::Config do
     # and asserts the proper result comes back out.
     [:api_key, :template_id, :zone_id, :instance_ready_timeout,
       :service_offering_id, :api_key,
-      :secret_key, :network_id].each do |attribute|
+      :secret_key, :network_id, :user_data].each do |attribute|
 
       it "should not default #{attribute} if overridden" do
         instance.send("#{attribute}=".to_sym, "foo")

data/vagrant-cloudstack.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "vagrant-cloudstack"
 
-  s.add_runtime_dependency "fog", "~> 1.20.0"
+  s.add_runtime_dependency "fog", "~> 1.22.0"
 
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec-core", "~> 2.14.7"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-cloudstack
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Mitchell Hashimoto
@@ -18,7 +18,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -26,14 +26,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.20.0
+        version: 1.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.20.0
+        version: 1.22.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement