vagrant-openstack-plugin 0.1.3 → 0.2.0

data/README.md

@@ -53,6 +53,9 @@ require 'vagrant-openstack-plugin'
 Vagrant.configure("2") do |config|
   config.vm.box = "dummy"
 
+  # 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']}" 
@@ -61,6 +64,12 @@ Vagrant.configure("2") do |config|
     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.security_groups = ['ssh', 'http']   # Optional
+    os.tenant = "YOUR TENANT_NAME"         # Optional
+
   end
 end
 ```
@@ -103,7 +112,16 @@ This provider exposes quite a few provider-specific configuration options:
   can be overridden with this.
 * `username` - The username with which to access OpenStack.
 * `keypair_name` - The name of the keypair to access the machine.
-* `ssh_username` - The username to access the machine.
+* `ssh_username` - The username to access the machine. This can also be
+  configured using the standard config.ssh.username configuration value.
+* `metadata` - A set of key pair values that will be passed to the instance
+  for configuration.
+* `network` - A name or id that will be used to fetch network configuration
+  data when configuring the instance. NOTE: This is not compliant with the
+  vagrant network configurations.
+* `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.
+
 
 These can be set like typical provider-specific configuration:
 

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

@@ -19,13 +19,15 @@ module VagrantPlugins
           api_key  = config.api_key
           endpoint = config.endpoint
           username = config.username
+          tenant = config.tenant
 
           @logger.info("Connecting to OpenStack...")
           env[:openstack_compute] = Fog::Compute.new({
             :provider => :openstack,
             :openstack_username => username,
             :openstack_api_key => api_key,
-            :openstack_auth_url => endpoint
+            :openstack_auth_url => endpoint,
+            :openstack_tenant => tenant
           })
 
           if config.network

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

@@ -32,12 +32,6 @@ module VagrantPlugins
           # Figure out the name for the server
           server_name = config.server_name || env[:machine].name
 
-          # Output the settings we're going to use to the user
-          env[:ui].info(I18n.t("vagrant_openstack.launching_server"))
-          env[:ui].info(" -- Flavor: #{flavor.name}")
-          env[:ui].info(" -- Image: #{image.name}")
-          env[:ui].info(" -- Name: #{server_name}")
-
           # Build the options for launching...
           options = {
             :flavor_ref  => flavor.id,
@@ -45,14 +39,28 @@ module VagrantPlugins
             :name        => server_name,
             :key_name    => config.keypair_name,
             :metadata    => config.metadata,
-            :user_data_encoded => Base64.encode64(config.user_data)
+            :user_data_encoded => Base64.encode64(config.user_data),
+            :security_groups => config.security_groups
           }
           
           # Find a network if provided
           if config.network
+            env[:ui].info(I18n.t("vagrant_openstack.finding_network"))
             network = find_matching(env[:openstack_network].networks, config.network)
             options[:nics] = [{"net_id" => network.id}] if network
           end
+          
+          # Output the settings we're going to use to the user
+          env[:ui].info(I18n.t("vagrant_openstack.launching_server"))
+          env[:ui].info(" -- Flavor: #{flavor.name}")
+          env[:ui].info(" -- Image: #{image.name}")
+          env[:ui].info(" -- Name: #{server_name}")
+          if network
+            env[:ui].info(" -- Network: #{network.name}")
+          end
+          if config.security_groups
+            env[:ui].info(" -- Security Groups: #{config.security_groups}")
+          end
 
           # Create the server
           server = env[:openstack_compute].servers.create(options)

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

@@ -42,6 +42,12 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :network
 
+      # List of strings representing the security groups to apply.
+      # e.g. ['ssh', 'http']
+      #
+      # @return [Array[String]]
+      attr_accessor :security_groups
+
       # The SSH username to use with this OpenStack instance. This overrides
       # the `config.ssh.username` variable.
       #
@@ -53,6 +59,11 @@ module VagrantPlugins
       # @return [Hash]
       attr_accessor :metadata
 
+      # The tenant to use.
+      #
+      # @return [String]
+      attr_accessor :tenant
+
       # User data to be sent to the newly created OpenStack instance. Use this
       # e.g. to inject a script at boot time.
       #
@@ -69,7 +80,9 @@ module VagrantPlugins
         @username = UNSET_VALUE
         @keypair_name = UNSET_VALUE
         @network  = UNSET_VALUE
+        @security_groups = UNSET_VALUE
         @ssh_username = UNSET_VALUE
+        @tenant = UNSET_VALUE
         @user_data = UNSET_VALUE
       end
 
@@ -79,17 +92,20 @@ module VagrantPlugins
         @flavor   = /m1.tiny/ if @flavor == UNSET_VALUE
         @image    = /cirros/ if @image == UNSET_VALUE
         @server_name = nil if @server_name == UNSET_VALUE
-        @metadata = {} if @metadata == UNSET_VALUE
+        @metadata = nil if @metadata == UNSET_VALUE
         @username = nil if @username == UNSET_VALUE
         @network = nil if @network == UNSET_VALUE
 
         # Keypair defaults to nil
         @keypair_name = nil if @keypair_name == UNSET_VALUE
-        
+
+        @security_groups = nil if @security_groups == UNSET_VALUE
+
         # The SSH values by default are nil, and the top-level config
         # `config.ssh` values are used.
         @ssh_username = nil if @ssh_username == UNSET_VALUE
-        
+
+        @tenant = nil if @tenant == UNSET_VALUE
         @user_data = "" if @user_data == UNSET_VALUE
       end
 
@@ -98,7 +114,6 @@ module VagrantPlugins
 
         errors << I18n.t("vagrant_openstack.config.api_key_required") if !@api_key
         errors << I18n.t("vagrant_openstack.config.username_required") if !@username
-        errors << I18n.t("vagrant_openstack.config.metadata_must_be_hash") if !@metadata.is_a?(Hash) 
         
         { "OpenStack Provider" => errors }
       end

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

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module OpenStack
-    VERSION = "0.1.3"
+    VERSION = "0.2.0"
   end
 end

data/locales/en.yml

@@ -8,6 +8,8 @@ en:
       Finding flavor for server...
     finding_image: |-
       Finding image for server...
+    finding_network: |-
+      Finding network for server...
     launching_server: |-
       Launching a server with the following settings...
     not_created: |-

data/spec/vagrant-openstack-plugin/config_spec.rb

@@ -19,6 +19,8 @@ describe VagrantPlugins::OpenStack::Config do
     its(:keypair_name) { should be_nil }
     its(:ssh_username) { should be_nil }
     its(:network) { should be_nil }
+    its(:security_groups) { should be_nil }
+    its(:tenant) { should be_nil }
   end
 
   describe "overriding defaults" do
@@ -30,7 +32,9 @@ describe VagrantPlugins::OpenStack::Config do
       :username,
       :keypair_name,
       :network,
-      :ssh_username].each do |attribute|
+      :ssh_username,
+      :security_groups,
+      :tenant].each do |attribute|
       it "should not default #{attribute} if overridden" do
         subject.send("#{attribute}=".to_sym, "foo")
         subject.finalize!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-openstack-plugin
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-26 00:00:00.000000000 Z
+date: 2013-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -111,7 +111,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4139560228461145832
+      hash: -1985565957385980271
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4139560228461145832
+      hash: -1985565957385980271
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24