vagrant-openstack-plugin 0.2.2 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+--- 
+SHA1: 
+  metadata.gz: fb275fa87d4601a051b59152af3219c4420bdb78
+  data.tar.gz: 9acfe025144bf974f4574475ea11457f05d83d14
+SHA512: 
+  metadata.gz: 03895c57bd627fba2402596e02eeb2384b137b23c8c6aafa120a97285b6675f923736b01065f0ceed6de4f83d9202dd507b3159d2af31142ce885ef2ae1835de
+  data.tar.gz: 9836a275ca793adf8168eeb12f851392bc9c1f95d4fbea4f337c1976a1a52bcaa3606037b67bc304580c54e25d0f2e1d9fefcea2599d02461c4c71971798ec91

data/Authors.txt

@@ -0,0 +1,11 @@
+Brian Miller
+Corey Stubbs
+Hendrik Volkmer
+Jasper Capel
+Joe Topjian
+Jon Burgess
+Mathieu Mitchell
+Mitchell Hashimoto
+Stephan Renatus
+Thomas Kadauke
+Xavier Antoviaque

data/CHANGELOG.md

@@ -1,3 +1,50 @@
-# 0.1.0 (March 14, 2013)
+# Changelog for vagrant-openstack-plugin
 
-* Initial release.
+## 0.3.0 (September 25, 2013)
+
+- Adds support to determine IP address to use
+- Region Support
+- Enabled controlling multiple VMs in parallel
+- Honor disabling of synced folders
+- Adds `availability_zone` option to specify instance zone
+- Added --delete to rsync command
+- Call SetHostname action from Vagrant core in up phase
+- Handled not having the box and providing it via a box_url.
+- Allowed vagrant ssh -c 'command'
+- Adds tenant to network request
+- Improved documentation
+
+## 0.2.2  (May 30, 2013)
+
+- Also ignore HOSTUNREACH errors when first trying to connect to newly created VM
+
+## 0.2.1 (May 29, 2013)
+
+- Fix passing user data to server on create
+- Floating IP Capability
+- Added ability to configure scheduler hints
+- Update doc (network config in fact has higher precedence than address_id)
+- 'address_id' now defaults to 'public', to reduce number of cases in read_ssh_info
+- Introduced 'address_id' config, which has a higher order of precedence than 'network'
+
+## 0.2.0 (May 2, 2013)
+
+- Added docs
+- Removed metadata validation and bumped version
+- Tenant and security groups are now configurable
+
+## 0.1.3 (April 26, 2013)
+
+- Added the ability to pass metadata keypairs to instances
+- Added support for nics configurations to allow for selection of a specific network on creation
+
+## 0.1.2 (April 26, 2013)
+
+- Added the option of passing user data to VMs
+- Enabled `vagrant provision` in this provider
+- Made finding IP address more stable
+- Doc improvements and minor fixes
+
+## 0.1.0 (March 14, 2013)
+
+- Initial release

data/README.md

@@ -56,23 +56,26 @@ Vagrant.configure("2") do |config|
   # Make sure the private key from the key pair is provided
   config.ssh.private_key_path = "~/.ssh/id_rsa"
 
-  config.vm.provider :openstack do |os|    # e.g.
-    os.username = "YOUR USERNAME"          # "#{ENV['OS_USERNAME']}"
-    os.api_key  = "YOUR API KEY"           # "#{ENV['OS_PASSWORD']}" 
-    os.flavor   = /m1.tiny/
-    os.image    = /Ubuntu/
-    os.endpoint = "KEYSTONE AUTH URL"      # "#{ENV['OS_AUTH_URL']}/tokens"  
-    os.keypair_name = "YOUR KEYPAIR NAME"
-    os.ssh_username = "SSH USERNAME"
-    os.metadata = {"key" => "value"}       # Optional
-    os.network = "YOUR NETWORK_NAME"       # Optional
-    os.address_id = "YOUR ADDRESS ID"      # Optional (`network` above has higher precedence)
-    os.scheduler_hints = {
+  config.vm.provider :openstack do |os|
+    os.username     = "YOUR USERNAME"          # e.g. "#{ENV['OS_USERNAME']}"
+    os.api_key      = "YOUR API KEY"           # e.g. "#{ENV['OS_PASSWORD']}"
+    os.flavor       = /m1.tiny/                # Regex or String
+    os.image        = /Ubuntu/                 # Regex or String
+    os.endpoint     = "KEYSTONE AUTH URL"      # e.g. "#{ENV['OS_AUTH_URL']}/tokens"
+    os.keypair_name = "YOUR KEYPAIR NAME"      # as stored in Nova
+    os.ssh_username = "SSH USERNAME"           # login for the VM
+
+    os.metadata  = {"key" => "value"}                      # optional
+    os.user_data = "#cloud-config\nmanage_etc_hosts: True" # optional
+    os.network            = "YOUR NETWORK_NAME"            # optional
+    os.address_id         = "YOUR ADDRESS ID"              # optional (`network` above has higher precedence)
+    os.scheduler_hints    = {
         :cell => 'australia'
-    }                                      # Optional
-    os.security_groups = ['ssh', 'http']   # Optional
-    os.tenant = "YOUR TENANT_NAME"         # Optional
-
+    }                                          # optional
+    os.availability_zone  = "az0001"           # optional
+    os.security_groups    = ['ssh', 'http']    # optional
+    os.tenant             = "YOUR TENANT_NAME" # optional
+    os.floating_ip        = "33.33.33.33"      # optional (The floating IP to assign for this instance)
   end
 end
 ```
@@ -125,8 +128,11 @@ This provider exposes quite a few provider-specific configuration options:
 * `address_id` - A specific address identifier to use when connecting to the
   instance. `network` has higher precedence.
 * `scheduler_hints` - Pass hints to the open stack scheduler, see `--hint` flag in [OpenStack filters doc](http://docs.openstack.org/trunk/openstack-compute/admin/content/scheduler-filters.html)
+* `availability_zone` - Specify the availability zone in which the instance
+  must be created.
 * `security_groups` - List of security groups to be applied to the machine.
 * `tenant` - Tenant name.  You only need to specify this if your OpenStack user has access to multiple tenants.
+* `region` - Region Name. Specify the region you want the instance to be launched in for multi-region environments.
 
 
 These can be set like typical provider-specific configuration:

data/lib/vagrant-openstack-plugin/action.rb

@@ -60,8 +60,23 @@ module VagrantPlugins
         end
       end
 
+      def self.action_ssh_run
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use Call, IsCreated do |env, b2|
+            if !env[:result]
+              b2.use MessageNotCreated
+              next
+            end
+
+            b2.use SSHRun
+          end
+        end
+      end
+
       def self.action_up
         Vagrant::Action::Builder.new.tap do |b|
+          b.use HandleBoxUrl
           b.use ConfigValidate
           b.use Call, IsCreated do |env, b2|
             if env[:result]
@@ -72,6 +87,7 @@ module VagrantPlugins
             b2.use ConnectOpenStack
             b2.use Provision
             b2.use SyncFolders
+            b2.use SetHostname
             b2.use WarnNetworks
             b2.use CreateServer
           end

data/lib/vagrant-openstack-plugin/action/connect_openstack.rb

@@ -20,6 +20,7 @@ module VagrantPlugins
           endpoint = config.endpoint
           username = config.username
           tenant = config.tenant
+          region = config.region
 
           @logger.info("Connecting to OpenStack...")
           env[:openstack_compute] = Fog::Compute.new({
@@ -27,7 +28,8 @@ module VagrantPlugins
             :openstack_username => username,
             :openstack_api_key => api_key,
             :openstack_auth_url => endpoint,
-            :openstack_tenant => tenant
+            :openstack_tenant => tenant,
+            :openstack_region => region
           })
 
           if config.network
@@ -35,7 +37,8 @@ module VagrantPlugins
               :provider => :openstack,
               :openstack_username => username,
               :openstack_api_key => api_key,
-              :openstack_auth_url => endpoint
+              :openstack_auth_url => endpoint,
+              :openstack_tenant => tenant
             })
           end
 

data/lib/vagrant-openstack-plugin/action/create_server.rb

@@ -41,7 +41,8 @@ module VagrantPlugins
             :metadata    => config.metadata,
             :user_data   => config.user_data,
             :security_groups => config.security_groups,
-            :os_scheduler_hints => config.scheduler_hints
+            :os_scheduler_hints => config.scheduler_hints,
+            :availability_zone => config.availability_zone
           }
           
           # Find a network if provided

data/lib/vagrant-openstack-plugin/action/read_ssh_info.rb

@@ -31,11 +31,49 @@ module VagrantPlugins
 
           config = machine.provider_config
 
+          # Print a list of the available networks
+          server.addresses.each do |network_name, network_info|
+            @logger.debug("OpenStack Network Name: #{network_name}")
+          end
+
           if config.network
             host = server.addresses[config.network].last['addr'] rescue nil
           else
             host = server.addresses[config.address_id].last['addr'] rescue nil
           end
+
+          # If host is still nil, try to find the IP address another way
+          if host.nil?
+            @logger.debug("Was unable to determine what network to use. Trying to find a valid IP to use.")
+            if server.public_ip_addresses.length > 0
+              @logger.debug("Public IP addresses available: #{server.public_ip_addresses}")
+              if config.floating_ip
+                if server.public_ip_addresses.include?(config.floating_ip)
+                  @logger.debug("Using the floating IP defined in Vagrantfile.")
+                  host = config.floating_ip
+                else
+                  @logger.debug("The floating IP that was specified is not available to this instance.")
+                  raise Errors::FloatingIPNotValid
+                end
+              else
+                host = server.public_ip_address
+                @logger.debug("Using the first available public IP address: #{host}.")
+              end
+            elsif server.private_ip_addresses.length > 0
+              @logger.debug("Private IP addresses available: #{server.private_ip_addresses}")
+              host = server.private_ip_address
+              @logger.debug("Using the first available private IP address: #{host}.")
+            end
+          end
+
+          # If host got this far and is still nil/empty, raise an error or
+          # else vagrant will try connecting to localhost which will never
+          # make sense in this scenario
+          if host.nil? or host.empty?
+            @logger.debug("No valid SSH host could be found.")
+            raise Errors::SSHNoValidHost
+          end
+
           # Read the DNS info
           return {
             # Usually there should only be one public IP

data/lib/vagrant-openstack-plugin/action/sync_folders.rb

@@ -19,6 +19,13 @@ module VagrantPlugins
           ssh_info = env[:machine].ssh_info
 
           env[:machine].config.vm.synced_folders.each do |id, data|
+
+            # ignore disabled shared folders
+            if data[:disabled]
+              @logger.info "Not syncing disabled folder: #{data[:hostpath]} => #{data[:guestpath]}"
+              next
+            end
+
             hostpath  = File.expand_path(data[:hostpath], env[:root_path])
             guestpath = data[:guestpath]
 
@@ -37,7 +44,7 @@ module VagrantPlugins
 
             # Rsync over to the guest path using the SSH info
             command = [
-              "rsync", "--verbose", "--archive", "-z",
+              "rsync", "--verbose", "--archive", "-z", "--delete",
               "--exclude", ".vagrant/",
               "-e", "ssh -p #{ssh_info[:port]} -o StrictHostKeyChecking=no -i '#{ssh_info[:private_key_path]}'",
               hostpath,

data/lib/vagrant-openstack-plugin/config.rb

@@ -31,12 +31,12 @@ module VagrantPlugins
       #
       # @return [String]
       attr_accessor :username
-      
+
       # The name of the keypair to use.
       #
       # @return [String]
       attr_accessor :keypair_name
-      
+
       # Network configurations for the instance
       #
       # @return [String]
@@ -50,6 +50,9 @@ module VagrantPlugins
       # Pass hints to the OpenStack scheduler, e.g. { "cell": "some cell name" }
       attr_accessor :scheduler_hints
 
+      # Specify the availability zone in which to create the instance
+      attr_accessor :availability_zone
+
       # List of strings representing the security groups to apply.
       # e.g. ['ssh', 'http']
       #
@@ -77,11 +80,17 @@ module VagrantPlugins
       #
       # @return [String]
       attr_accessor :user_data
-      
+
       # The floating IP address from the IP pool which will be assigned to the instance.
       #
       # @return [String]
       attr_accessor :floating_ip
+
+      # The region to specify when the OpenStack cloud has multiple regions
+      #
+      # @return [String]
+      attr_accessor :region
+
       def initialize
         @api_key  = UNSET_VALUE
         @endpoint = UNSET_VALUE
@@ -94,11 +103,13 @@ module VagrantPlugins
         @network  = UNSET_VALUE
         @address_id  = UNSET_VALUE
         @scheduler_hints = UNSET_VALUE
+        @availability_zone = UNSET_VALUE
         @security_groups = UNSET_VALUE
         @ssh_username = UNSET_VALUE
         @tenant = UNSET_VALUE
         @user_data = UNSET_VALUE
         @floating_ip = UNSET_VALUE
+        @region = UNSET_VALUE
       end
 
       def finalize!
@@ -116,6 +127,7 @@ module VagrantPlugins
         @keypair_name = nil if @keypair_name == UNSET_VALUE
 
         @scheduler_hints = nil if @scheduler_hints == UNSET_VALUE
+        @availability_zone = nil if @availability_zone == UNSET_VALUE
         @security_groups = nil if @security_groups == UNSET_VALUE
 
         # The SSH values by default are nil, and the top-level config
@@ -125,6 +137,8 @@ module VagrantPlugins
         @tenant = nil if @tenant == UNSET_VALUE
         @user_data = "" if @user_data == UNSET_VALUE
         @floating_ip = nil if @floating_ip == UNSET_VALUE
+
+        @region = nil if @region == UNSET_VALUE
       end
 
       def validate(machine)
@@ -132,7 +146,7 @@ module VagrantPlugins
 
         errors << I18n.t("vagrant_openstack.config.api_key_required") if !@api_key
         errors << I18n.t("vagrant_openstack.config.username_required") if !@username
-        
+
         { "OpenStack Provider" => errors }
       end
     end

data/lib/vagrant-openstack-plugin/errors.rb

@@ -22,6 +22,14 @@ module VagrantPlugins
       class RsyncError < VagrantOpenStackError
         error_key(:rsync_error)
       end
+
+      class SSHNoValidHost < VagrantOpenStackError
+        error_key(:ssh_no_valid_host)
+      end
+
+      class FloatingIPNotValid < VagrantOpenStackError
+        error_key(:floating_ip_not_valid)
+      end
     end
   end
 end

data/lib/vagrant-openstack-plugin/plugin.rb

@@ -23,7 +23,7 @@ module VagrantPlugins
         Config
       end
 
-      provider(:openstack) do
+      provider(:openstack, parallel: true) do
         # Setup some things
         OpenStack.init_i18n
         OpenStack.init_logging

data/lib/vagrant-openstack-plugin/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module OpenStack
-    VERSION = "0.2.2"
+    VERSION = "0.3.0"
   end
 end

data/locales/en.yml

@@ -54,7 +54,14 @@ en:
         Host path: %{hostpath}
         Guest path: %{guestpath}
         Error: %{stderr}
-
+      ssh_no_valid_host: |-
+        Unable to determine what host to connect to. Run `vagrant up` in
+        debug mode to see a list of networks available to your tenant.
+        Then set either `os.network` or `os.address_id` to one of the
+        network names.
+      floating_ip_not_valid: |-
+        The floating IP specified in the Vagrantfile does not match an
+        available public IP address returned by OpenStack.
     states:
       short_active: |-
         active

metadata

@@ -1,74 +1,61 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: vagrant-openstack-plugin
-version: !ruby/object:Gem::Version
-  version: 0.2.2
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  version: 0.3.0
 platform: ruby
-authors:
+authors: 
 - Mitchell Hashimoto
 - Thomas Kadauke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-30 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-09-25 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: fog
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.10.1
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.10.1
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - &id004 
+      - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 2.13.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.13.0
+  version_requirements: *id003
 description: Enables Vagrant to manage machines in OpenStack Cloud.
-email:
+email: 
 - mitchell@hashicorp.com
 - t.kadauke@cloudbau.de
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
+- Authors.txt
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -99,33 +86,26 @@ files:
 - vagrant-openstack-plugin.gemspec
 homepage: http://www.vagrantup.com
 licenses: []
+
+metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 688615191550607003
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 688615191550607003
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id004
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id004
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.1.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Enables Vagrant to manage machines in OpenStack Cloud.
-test_files:
+test_files: 
 - spec/vagrant-openstack-plugin/config_spec.rb