vagrant-cloudstack 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bb87274b9c5ad3a39e17fb4ddefece7076ae0cb
-  data.tar.gz: 9b6256bec79396f96659d72d1c1650d53a6883ee
+  metadata.gz: 8062f1e5775db2aeb409c886f250d1e7ae4823d8
+  data.tar.gz: 4f53a58c31e243b1d551c921461470f927197c3d
 SHA512:
-  metadata.gz: 5903a1a4b92be3dbdddf37198428fc7a647dc21d65e078d2b3f922a6154a3394785522f4acb63695cdcf7742af8e13d84fc62d684cc6bb7c2f16d952d7ea3fbb
-  data.tar.gz: 73831bed97569ed058aa4001e491f4e729526f671bc1157f12335884cd1ef1ded8d5c8a80f4628a6559bf116de46ab5d910c55a252395f037c670eba5d3c49d3
+  metadata.gz: 63564c569d834e3b865aa3f1d51deb927ce7a0987eedece60228035c8dedb131454e256fa6c8c9b1bfd8d67d1f0fc7875d9e50443a7a5bdc566541004da0580e
+  data.tar.gz: 96aa1a3e10ab72e94e0801a8953e6428e5aba96f8725dad9df937d959023d03d0c5dad3166c5b8fa4873244f85f5264040899d588d3d1046bc8539a47cc9a5a5

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.9.0 (Jun 25, 2014)
+* Clean up of dead code and comments.
+* Re-organize imports and code.
+* Corrects the dependency on Vagrant 1.5+
+* Updates documentation to refelect the above.
+* Now supports setting the machine hostname in Vagrantfile
+
 # 0.8.0 (Jun 24, 2014)
 * Remove unused code.
 * Add support for specifying most resources by name. Where applicable there is

data/README.md

@@ -8,11 +8,9 @@
 
 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)
+This is a [Vagrant](http://www.vagrantup.com) 1.5+ plugin that adds a [Cloudstack](http://cloudstack.apache.org)
 provider to Vagrant.
 
-**NOTE:** This plugin requires Vagrant 1.5+, since v0.4.0.
-
 ## Features
 
 * SSH into the instances.
@@ -90,6 +88,7 @@ Vagrant.configure("2") do |config|
     cloudstack.service_offering_name = "THE-BESTEST"
     cloudstack.network_name = "WOW-SUCH-FAST-OFFERING"
     cloudstack.zone_name = "District-9"
+    cloudstack.name = "doge-is-a-hostname-now"
     # Sadly there is currently no support for the project api in fog.
     cloudstack.project_id = "AAAAAAAAAAAAAAAAAAA"
     cloudstack.network_type = "Advanced" # or "Basic"
@@ -128,10 +127,11 @@ This gives the possibility to use the easier to remember name instead of the UUI
 this will also enable you to upgrade the different settings in your cloud without having
 to update UUIDs in your Vagrantfile. If both are specified, the id parameter takes precedence.
 
+* `name` - Hostname of the created machine
 * `host` - Cloudstack api host
 * `path` - Cloudstack api path
 * `port` - Cloudstack api port
-* `scheme` - Cloudstack api scheme _(default: http)_
+* `scheme` - Cloudstack api scheme _(defaults: https (thanks to the resolution order in fog))_
 * `api_key` - The api key for accessing Cloudstack
 * `secret_key` - The secret key for accessing Cloudstack
 * `instance_ready_timeout` - The number of seconds to wait for the instance

data/build_rpm.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-VERSION=0.8.0
+VERSION=0.9.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.rb

@@ -1,5 +1,4 @@
 require "pathname"
-
 require "vagrant-cloudstack/plugin"
 
 module VagrantPlugins

data/lib/vagrant-cloudstack/action.rb

@@ -1,5 +1,4 @@
 require "pathname"
-
 require "vagrant/action/builder"
 
 module VagrantPlugins

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

@@ -15,25 +15,25 @@ module VagrantPlugins
 
         def call(env)
           # Get the domain we're going to booting up in
-          domain = env[:machine].provider_config.domain_id
+          domain        = env[:machine].provider_config.domain_id
 
           # Get the configs
           domain_config = env[:machine].provider_config.get_domain_config(domain)
 
           # Build the fog config
-          fog_config = {
-            :provider      => :cloudstack
-            #:domain        => domain_config
+          fog_config    = {
+              :provider => :cloudstack
+              #:domain        => domain_config
           }
 
           if domain_config.api_key
-            fog_config[:cloudstack_api_key] = domain_config.api_key
+            fog_config[:cloudstack_api_key]           = domain_config.api_key
             fog_config[:cloudstack_secret_access_key] = domain_config.secret_key
           end
 
-          fog_config[:cloudstack_host] = domain_config.host if domain_config.host
-          fog_config[:cloudstack_path] = domain_config.path if domain_config.path
-          fog_config[:cloudstack_port] = domain_config.port if domain_config.port
+          fog_config[:cloudstack_host]   = domain_config.host if domain_config.host
+          fog_config[:cloudstack_path]   = domain_config.path if domain_config.path
+          fog_config[:cloudstack_port]   = domain_config.port if domain_config.port
           fog_config[:cloudstack_scheme] = domain_config.scheme if domain_config.scheme
 
           @logger.info("Connecting to Cloudstack...")

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

@@ -30,11 +30,11 @@ module VagrantPlugins
           end
 
           # Get the Port forwarding config
-          domain = machine.provider_config.domain_id
+          domain        = machine.provider_config.domain_id
           domain_config = machine.provider_config.get_domain_config(domain)
 
           pf_ip_address_id = domain_config.pf_ip_address_id
-          pf_public_port = domain_config.pf_public_port
+          pf_public_port   = domain_config.pf_public_port
 
           if pf_ip_address_id and pf_public_port
             begin

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

@@ -1,9 +1,6 @@
 require "log4r"
-require 'pp' # XXX FIXME REMOVE WHEN NOT NEEDED
-
-require 'vagrant/util/retryable'
-
-require 'vagrant-cloudstack/util/timer'
+require "vagrant/util/retryable"
+require "vagrant-cloudstack/util/timer"
 
 module VagrantPlugins
   module Cloudstack
@@ -19,34 +16,35 @@ module VagrantPlugins
 
         def call(env)
           # Initialize metrics if they haven't been
-          env[:metrics]        ||= {}
+          env[:metrics]         ||= {}
 
           # Get the domain we're going to booting up in
-          domain               = env[:machine].provider_config.domain_id
+          domain                = env[:machine].provider_config.domain_id
 
           # Get the configs
-          domain_config        = env[:machine].provider_config.get_domain_config(domain)
-          zone_id              = domain_config.zone_id
-          zone_name            = domain_config.zone_name
-          network_id           = domain_config.network_id
-          network_name         = domain_config.network_name
-          network_type         = domain_config.network_type
+          domain_config         = env[:machine].provider_config.get_domain_config(domain)
+          hostname              = domain_config.name
+          zone_id               = domain_config.zone_id
+          zone_name             = domain_config.zone_name
+          network_id            = domain_config.network_id
+          network_name          = domain_config.network_name
+          network_type          = domain_config.network_type
           #TODO: Fog currently does not support the project apis, when that is fixed we should add that here too.
-          project_id           = domain_config.project_id
-          service_offering_id  = domain_config.service_offering_id
-          service_offering_name  = domain_config.service_offering_name
-          template_id          = domain_config.template_id
-          template_name        = domain_config.template_name
-          keypair              = domain_config.keypair
-          pf_ip_address_id     = domain_config.pf_ip_address_id
-          pf_public_port       = domain_config.pf_public_port
-          pf_private_port      = domain_config.pf_private_port
-          display_name         = domain_config.display_name
-          group                = domain_config.group
-          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
+          project_id            = domain_config.project_id
+          service_offering_id   = domain_config.service_offering_id
+          service_offering_name = domain_config.service_offering_name
+          template_id           = domain_config.template_id
+          template_name         = domain_config.template_name
+          keypair               = domain_config.keypair
+          pf_ip_address_id      = domain_config.pf_ip_address_id
+          pf_public_port        = domain_config.pf_public_port
+          pf_private_port       = domain_config.pf_private_port
+          display_name          = domain_config.display_name
+          group                 = domain_config.group
+          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 for some reason the user have specified both network_name and network_id, take the id since that is
           # more specific than the name. But always try to fetch the name of the network to present to the user.
@@ -63,16 +61,16 @@ module VagrantPlugins
           end
 
           if service_offering_id.nil? and service_offering_name
-            service_offering_id   = name_to_id(env, service_offering_name, "service_offering")
+            service_offering_id = name_to_id(env, service_offering_name, "service_offering")
           elsif service_offering_id
             service_offering_name = id_to_name(env, service_offering_id, "service_offering")
           end
 
           if template_id.nil? and template_name
-            template_id = name_to_id(env, template_name, "template", {'zoneid' => zone_id,
+            template_id = name_to_id(env, template_name, "template", {'zoneid'         => zone_id,
                                                                       'templatefilter' => 'executable'})
           elsif template_id
-            template_name = id_to_name(env, template_id, "template", {'zoneid' => zone_id,
+            template_name = id_to_name(env, template_id, "template", {'zoneid'         => zone_id,
                                                                       'templatefilter' => 'executable'})
           end
 
@@ -208,6 +206,7 @@ module VagrantPlugins
 
             options['project_id'] = project_id if project_id != nil
             options['key_name']   = keypair if keypair != nil
+            options['name']       = hostname if hostname != nil
 
             if user_data != nil
               options['user_data'] = Base64.encode64(user_data)
@@ -233,8 +232,6 @@ module VagrantPlugins
           end
 
           # Immediately save the ID since it is created at this point.
-          # XXX FIXME does cloudstack+fog return the job id rather than
-          # server id?
           env[:machine].id                     = server.id
 
           # Wait for the instance to be ready first
@@ -365,21 +362,21 @@ module VagrantPlugins
 
         def translate_from_to(env, resource_type, options)
           pluralised_type = "#{resource_type}s"
-          full_response = env[:cloudstack_compute].send("list_#{pluralised_type}".to_sym, options)
-          full_response["list#{pluralised_type.tr('_','')}response"][resource_type.tr('_','')]
+          full_response   = env[:cloudstack_compute].send("list_#{pluralised_type}".to_sym, options)
+          full_response["list#{pluralised_type.tr('_', '')}response"][resource_type.tr('_', '')]
         end
 
         def name_to_id(env, resource_name, resource_type, options={})
           env[:ui].info("Fetching UUID for #{resource_type} named '#{resource_name}'")
           full_response = translate_from_to(env, resource_type, options)
-          result = full_response.find { |type| type["name"] == resource_name }
+          result        = full_response.find { |type| type["name"] == resource_name }
           result['id']
         end
 
         def id_to_name(env, resource_id, resource_type, options={})
           env[:ui].info("Fetching name for #{resource_type} with UUID '#{resource_id}'")
           options.merge({'id' => resource_id})
-          full_response   =  translate_from_to(env, resource_type, options)
+          full_response = translate_from_to(env, resource_type, options)
           full_response[0]['name']
         end
       end

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

@@ -1,8 +1,6 @@
 require "log4r"
-
-require 'vagrant/util/retryable'
-
-require 'vagrant-cloudstack/util/timer'
+require "vagrant/util/retryable"
+require "vagrant-cloudstack/util/timer"
 
 module VagrantPlugins
   module Cloudstack
@@ -27,8 +25,8 @@ module VagrantPlugins
           begin
             server.start
 
-            domain = env[:machine].provider_config.domain_id
-            domain_config = env[:machine].provider_config.get_domain_config(domain)
+            domain                               = env[:machine].provider_config.domain_id
+            domain_config                        = env[:machine].provider_config.get_domain_config(domain)
 
             # Wait for the instance to be ready first
             env[:metrics]["instance_ready_time"] = Util::Timer.time do
@@ -46,7 +44,7 @@ module VagrantPlugins
               rescue Fog::Errors::TimeoutError
                 # Notify the user
                 raise Errors::InstanceReadyTimeout,
-                  timeout: domain_config.instance_ready_timeout
+                      timeout: domain_config.instance_ready_timeout
               end
             end
           rescue Fog::Compute::Cloudstack::Error => e

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

@@ -1,9 +1,6 @@
 require "log4r"
-
 require "vagrant/util/subprocess"
-
 require "vagrant/util/scoped_hash_override"
-
 require "vagrant/util/which"
 
 module VagrantPlugins
@@ -40,7 +37,7 @@ module VagrantPlugins
 
             # Make sure there is a trailing slash on the host path to
             # avoid creating an additional directory with rsync
-            hostpath = "#{hostpath}/" if hostpath !~ /\/$/
+            hostpath  = "#{hostpath}/" if hostpath !~ /\/$/
 
             # on windows rsync.exe requires cygdrive-style paths
             if Vagrant::Util::Platform.windows?
@@ -53,22 +50,22 @@ module VagrantPlugins
             end
 
             env[:ui].info(I18n.t("vagrant_cloudstack.rsync_folder",
-                                :hostpath => hostpath,
-                                :guestpath => guestpath))
+                                 :hostpath  => hostpath,
+                                 :guestpath => guestpath))
 
             # Create the guest path
             env[:machine].communicate.sudo("mkdir -p '#{guestpath}'")
             env[:machine].communicate.sudo(
-              "chown #{ssh_info[:username]} '#{guestpath}'")
+                "chown #{ssh_info[:username]} '#{guestpath}'")
 
             # Rsync over to the guest path using the SSH info
             private_keys = (ssh_info[:private_key_path].class == Array ? ssh_info[:private_key_path].join(",") : ssh_info[:private_key_path])
-            command = [
-              "rsync", "--verbose", "--archive", "-z",
-              "--exclude", ".vagrant/",
-              "-e", "ssh -p #{ssh_info[:port]} -o StrictHostKeyChecking=no -i '#{private_keys}'",
-              hostpath,
-              "#{ssh_info[:username]}@#{ssh_info[:host]}:#{guestpath}"]
+            command      = [
+                "rsync", "--verbose", "--archive", "-z",
+                "--exclude", ".vagrant/",
+                "-e", "ssh -p #{ssh_info[:port]} -o StrictHostKeyChecking=no -i '#{private_keys}'",
+                hostpath,
+                "#{ssh_info[:username]}@#{ssh_info[:host]}:#{guestpath}"]
 
             # we need to fix permissions when using rsync.exe on windows, see
             # http://stackoverflow.com/questions/5798807/rsync-permission-denied-created-directories-have-no-permissions
@@ -79,9 +76,9 @@ module VagrantPlugins
             r = Vagrant::Util::Subprocess.execute(*command)
             if r.exit_code != 0
               raise Errors::RsyncError,
-                :guestpath => guestpath,
-                :hostpath => hostpath,
-                :stderr => r.stderr
+                    :guestpath => guestpath,
+                    :hostpath  => hostpath,
+                    :stderr    => r.stderr
             end
           end
         end

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

@@ -11,7 +11,7 @@ module VagrantPlugins
             super
           end
 
-          env[:metrics] ||= {}
+          env[:metrics]                      ||= {}
           env[:metrics]["provisioner_times"] ||= []
           env[:metrics]["provisioner_times"] << [p.class.to_s, timer]
         end

data/lib/vagrant-cloudstack/config.rb

@@ -8,6 +8,12 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :host
 
+      # Hostname for the machine instance
+      # This will be passed through to the api.
+      #
+      # @return [String]
+      attr_accessor :name
+
       # Cloudstack api path.
       #
       # @return [String]
@@ -148,45 +154,46 @@ module VagrantPlugins
       #
       # @return [String]
       attr_accessor :user_data
-      
+
 
       def initialize(domain_specific=false)
-        @host                   = UNSET_VALUE
-        @path                   = UNSET_VALUE
-        @port                   = UNSET_VALUE
-        @scheme                 = UNSET_VALUE
-        @api_key                = UNSET_VALUE
-        @secret_key             = UNSET_VALUE
-        @instance_ready_timeout = UNSET_VALUE
-        @domain_id              = UNSET_VALUE
-        @network_id             = UNSET_VALUE
-        @network_name           = UNSET_VALUE
-        @network_type           = UNSET_VALUE
-        @project_id             = UNSET_VALUE
-        @service_offering_id    = UNSET_VALUE
-        @service_offering_name  = UNSET_VALUE
-        @template_id            = UNSET_VALUE
-        @template_name          = UNSET_VALUE
-        @zone_id                = UNSET_VALUE
-        @zone_name              = UNSET_VALUE
-        @keypair                = UNSET_VALUE
-        @pf_ip_address_id       = UNSET_VALUE
-        @pf_public_port         = UNSET_VALUE
-        @pf_private_port        = UNSET_VALUE
-        @security_group_ids     = UNSET_VALUE
-        @display_name           = UNSET_VALUE
-        @group                  = UNSET_VALUE
-        @security_group_names   = UNSET_VALUE
-        @security_groups        = UNSET_VALUE
-        @user_data              = UNSET_VALUE
+        @host                      = UNSET_VALUE
+        @name                      = UNSET_VALUE
+        @path                      = UNSET_VALUE
+        @port                      = UNSET_VALUE
+        @scheme                    = UNSET_VALUE
+        @api_key                   = UNSET_VALUE
+        @secret_key                = UNSET_VALUE
+        @instance_ready_timeout    = UNSET_VALUE
+        @domain_id                 = UNSET_VALUE
+        @network_id                = UNSET_VALUE
+        @network_name              = UNSET_VALUE
+        @network_type              = UNSET_VALUE
+        @project_id                = UNSET_VALUE
+        @service_offering_id       = UNSET_VALUE
+        @service_offering_name     = UNSET_VALUE
+        @template_id               = UNSET_VALUE
+        @template_name             = UNSET_VALUE
+        @zone_id                   = UNSET_VALUE
+        @zone_name                 = UNSET_VALUE
+        @keypair                   = UNSET_VALUE
+        @pf_ip_address_id          = UNSET_VALUE
+        @pf_public_port            = UNSET_VALUE
+        @pf_private_port           = UNSET_VALUE
+        @security_group_ids        = UNSET_VALUE
+        @display_name              = UNSET_VALUE
+        @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)
         @__compiled_domain_configs = {}
-        @__finalized = false
-        @__domain_config = {}
-        @__domain_specific = domain_specific
+        @__finalized               = false
+        @__domain_config           = {}
+        @__domain_specific         = domain_specific
       end
 
       # Allows domain-specific overrides of any of the settings on this
@@ -230,7 +237,7 @@ module VagrantPlugins
           # has it.
           new_domain_specific = other.instance_variable_get(:@__domain_specific)
           result.instance_variable_set(
-            :@__domain_specific, new_domain_specific || @__domain_specific)
+              :@__domain_specific, new_domain_specific || @__domain_specific)
 
           # Go through all the domain configs and prepend ours onto
           # theirs.
@@ -250,89 +257,92 @@ module VagrantPlugins
       end
 
       def finalize!
-        # Domain_id must be nil, since we can't default that
-        @host = nil if @host == UNSET_VALUE
+        # Host must be nil, since we can't default that
+        @host                   = nil if @host == UNSET_VALUE
+
+        # Name must be nil, since we can't default that
+        @name                   = nil if @name == UNSET_VALUE
 
         # Path must be nil, since we can't default that
-        @path = nil if @path == UNSET_VALUE
+        @path                   = nil if @path == UNSET_VALUE
 
         # Port must be nil, since we can't default that
-        @port = nil if @port == UNSET_VALUE
+        @port                   = nil if @port == UNSET_VALUE
 
         # We default the scheme to whatever the user has specifid in the .fog file
         # *OR* whatever is default for the provider in the fog library
-        @scheme = nil if @scheme == UNSET_VALUE
+        @scheme                 = nil if @scheme == UNSET_VALUE
 
         # Try to get access keys from environment variables, they will
         # default to nil if the environment variables are not present
-        @api_key = ENV['CLOUDSTACK_API_KEY'] if @api_key == UNSET_VALUE
-        @secret_key = ENV['CLOUDSTACK_SECRET_KEY'] if @secret_key == UNSET_VALUE
+        @api_key                = ENV['CLOUDSTACK_API_KEY'] if @api_key == UNSET_VALUE
+        @secret_key             = ENV['CLOUDSTACK_SECRET_KEY'] if @secret_key == UNSET_VALUE
 
         # Set the default timeout for waiting for an instance to be ready
         @instance_ready_timeout = 120 if @instance_ready_timeout == UNSET_VALUE
 
         # Domain id must be nil, since we can't default that
-        @domain_id = nil if @domain_id == UNSET_VALUE
+        @domain_id              = nil if @domain_id == UNSET_VALUE
 
         # Network uuid must be nil, since we can't default that
-        @network_id = nil if @network_id == UNSET_VALUE
+        @network_id             = nil if @network_id == UNSET_VALUE
 
         # Network uuid must be nil, since we can't default that
-        @network_name = nil if @network_name == UNSET_VALUE
+        @network_name           = nil if @network_name == UNSET_VALUE
 
         # NetworkType is 'Advanced' by default
-        @network_type = "Advanced" if @network_type == UNSET_VALUE
+        @network_type           = "Advanced" if @network_type == UNSET_VALUE
 
         # Project uuid must be nil, since we can't default that
-        @project_id = nil if @project_id == UNSET_VALUE
+        @project_id             = nil if @project_id == UNSET_VALUE
 
         # Service offering uuid must be nil, since we can't default that
-        @service_offering_id = nil if @service_offering_id == UNSET_VALUE
+        @service_offering_id    = nil if @service_offering_id == UNSET_VALUE
 
         # Service offering name must be nil, since we can't default that
-        @service_offering_name = nil if @service_offering_name == UNSET_VALUE
+        @service_offering_name  = nil if @service_offering_name == UNSET_VALUE
 
         # Template uuid must be nil, since we can't default that
-        @template_id = nil if @template_id == UNSET_VALUE
+        @template_id            = nil if @template_id == UNSET_VALUE
 
         # Template name must be nil, since we can't default that
-        @template_name = nil if @template_name == UNSET_VALUE
+        @template_name          = nil if @template_name == UNSET_VALUE
 
         # Zone uuid must be nil, since we can't default that
-        @zone_id = nil if @zone_id == UNSET_VALUE
+        @zone_id                = nil if @zone_id == UNSET_VALUE
 
         # Zone uuid must be nil, since we can't default that
-        @zone_name = nil if @zone_name == UNSET_VALUE
+        @zone_name              = nil if @zone_name == UNSET_VALUE
 
         # Keypair defaults to nil
-        @keypair = nil if @keypair == UNSET_VALUE
+        @keypair                = nil if @keypair == UNSET_VALUE
 
         # IP address id must be nil, since we can't default that
-        @pf_ip_address_id = nil if @pf_ip_address_id == UNSET_VALUE
+        @pf_ip_address_id       = nil if @pf_ip_address_id == UNSET_VALUE
 
         # Public port must be nil, since we can't default that
-        @pf_public_port = nil if @pf_public_port == UNSET_VALUE
+        @pf_public_port         = nil if @pf_public_port == UNSET_VALUE
 
         # Private port must be nil, since we can't default that
-        @pf_private_port = nil if @pf_private_port == UNSET_VALUE
+        @pf_private_port        = nil if @pf_private_port == UNSET_VALUE
 
         # Security Group IDs must be nil, since we can't default that
-        @security_group_ids = nil if @security_group_ids == UNSET_VALUE
+        @security_group_ids     = nil if @security_group_ids == UNSET_VALUE
 
         # Security Group Names must be nil, since we can't default that
-        @security_group_names = nil if @security_group_names == UNSET_VALUE
+        @security_group_names   = nil if @security_group_names == UNSET_VALUE
 
         # Security Groups must be nil, since we can't default that
-        @security_groups = nil if @security_groups == UNSET_VALUE
+        @security_groups        = nil if @security_groups == UNSET_VALUE
 
         # Display name must be nil, since we can't default that
-        @display_name = nil if @display_name == UNSET_VALUE
+        @display_name           = nil if @display_name == UNSET_VALUE
 
         # Group must be nil, since we can't default that
-        @group = nil if @group == UNSET_VALUE
+        @group                  = nil if @group == UNSET_VALUE
 
         # User Data is nil by default
-        @user_data = nil if @user_data == UNSET_VALUE
+        @user_data              = nil if @user_data == UNSET_VALUE
 
         # Compile our domain specific configurations only within
         # NON-DOMAIN-SPECIFIC configurations.
@@ -369,13 +379,13 @@ module VagrantPlugins
 
           if !config.use_fog_profile
             errors << I18n.t("vagrant_cloudstack.config.api_key_required") if \
-              config.access_key_id.nil?
+               config.access_key_id.nil?
             errors << I18n.t("vagrant_cloudstack.config.secret_key_required") if \
-              config.secret_access_key.nil?
+               config.secret_access_key.nil?
           end
         end
 
-        { "Cloudstack Provider" => errors }
+        {"Cloudstack Provider" => errors}
       end
 
       # This gets the configuration for a specific domain. It shouldn't

data/lib/vagrant-cloudstack/plugin.rb

@@ -6,8 +6,8 @@ end
 
 # This is a sanity check to make sure no one is attempting to install
 # this into an early Vagrant version.
-if Vagrant::VERSION < "1.2.0"
-  raise "The Vagrant Cloudstack plugin is only compatible with Vagrant 1.2+"
+if Vagrant::VERSION < "1.5.0"
+  raise "The Vagrant Cloudstack plugin is only compatible with Vagrant 1.5+"
 end
 
 module VagrantPlugins
@@ -24,7 +24,7 @@ module VagrantPlugins
         Config
       end
 
-      provider(:cloudstack, parallel: true) do        # Setup logging and i18n
+      provider(:cloudstack, parallel: true) do # Setup logging and i18n
         setup_logging
         setup_i18n
 
@@ -61,10 +61,10 @@ module VagrantPlugins
         # Set the logging level on all "vagrant" namespaced
         # logs as long as we have a valid level.
         if level
-          logger = Log4r::Logger.new("vagrant_cloudstack")
+          logger            = Log4r::Logger.new("vagrant_cloudstack")
           logger.outputters = Log4r::Outputter.stderr
-          logger.level = level
-          logger = nil
+          logger.level      = level
+          logger            = nil
         end
       end
     end

data/lib/vagrant-cloudstack/provider.rb

@@ -34,8 +34,8 @@ module VagrantPlugins
         state_id = env[:machine_state_id]
 
         # Get the short and long description
-        short = I18n.t("vagrant_cloudstack.states.short_#{state_id}")
-        long  = I18n.t("vagrant_cloudstack.states.long_#{state_id}")
+        short    = I18n.t("vagrant_cloudstack.states.short_#{state_id}")
+        long     = I18n.t("vagrant_cloudstack.states.long_#{state_id}")
 
         # Return the MachineState object
         Vagrant::MachineState.new(state_id, short, long)

data/lib/vagrant-cloudstack/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Cloudstack
-    VERSION = "0.8.0"
+    VERSION = "0.9.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-cloudstack
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Mitchell Hashimoto
@@ -18,7 +18,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-24 00:00:00.000000000 Z
+date: 2014-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog