vagrant-openstack-plugin 0.9.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4a2573c4893aacaf5eafcd37a7a8ce319a14efa
-  data.tar.gz: 34320161be42ead897bc79b3f461ebf36a8fa1f6
+  metadata.gz: f101fc3c74f7fb1e3d33a8ef15a48d0089f0d08e
+  data.tar.gz: 46372f4bb20d168e3cec85ef3dfdcc437ba46344
 SHA512:
-  metadata.gz: 6afa95bb2bc69c5f799def8fc8adf365818ad44a5ea82f09b5274af24a9af9a9f55252f2c61d3a1ffe66e8cb77ae05bde3d00f4fd35d22efc3b6ec34b0708364
-  data.tar.gz: 61870faf5f6b0d5fcfb68e89ddc5296403c8d0862769768d86b6807fc1f9ed0902e7b6305bb0f0701220a69a9db926ed097bbbd93ef11879b0429e54decbecdb
+  metadata.gz: d27c4cad80f1270a5d52a6c558d63e8406fb24d62e2dfddda0790a5576253e88fce41987be155d4f935e8f8b98de1d2f642cddce3c04d78a7763a515cdd504d8
+  data.tar.gz: f14c372717634e8d09ba1ccc6c9e1ca3d3468577b4004960a7890eb7482b76235d97d93729563e18f38b53b2ed94e5051adac36c759c592b0d86c3a6c95c11d7

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog for vagrant-openstack-plugin
 
+## 0.10.0
+
+- Merge pull request #84 from cbaenziger/volume_support [view commit](http://github.com///commit/fc613a49cb5b2fecf2255d3050d1bff68956735d)
+- Add support for creating OpenStack Volumes [view commit](http://github.com///commit/60ed3924957bb7eefa95e113336165d76da3a985)
+
 ## 0.9.1
 
 - Merge pull request #91 from Chealion/master [view commit](http://github.com///commit/6285cae325afa378e90f06635a2cc39b1428a6dd)

data/README.md

@@ -79,6 +79,11 @@ Vagrant.configure("2") do |config|
     os.floating_ip        = "33.33.33.33"      # optional (The floating IP to assign for this instance)
     os.floating_ip_pool   = "public"           # optional (The floating IP pool to allocate addresses from, if floating_ip = :auto)
 
+    os.disks              = [                  # optional
+                             {"name" => "volume_name_here", "description" => "First 10GB Volume", "size" => 10},
+                             {"name" => "volume_name_here", "description" => "Second 10GB Volume", "size" => 10}
+                            ]
+
     os.orchestration_stack_name = 'stack01'				# optional
     os.orchestration_cfn_template_file = '/tmp/cfn_heat_template.json'	# optional
     os.orchestration_cfn_template_parameters = {			# optional

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

@@ -58,6 +58,18 @@ module VagrantPlugins
             })
           end
 
+          if config.disks && !config.disks.empty?
+            env[:openstack_volume] = Fog::Volume.new({
+              :provider => :openstack,
+              :connection_options => connection_options,
+              :openstack_username => username,
+              :openstack_api_key => api_key,
+              :openstack_auth_url => endpoint,
+              :openstack_tenant => tenant,
+              :openstack_region => region
+            })
+          end
+
           @app.call(env)
         end
       end

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

@@ -79,7 +79,7 @@ module VagrantPlugins
             end
             env[:ui].info("options[:nics]: #{options[:nics]}")
           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}")
@@ -141,6 +141,40 @@ module VagrantPlugins
                 floater.server = server
               end
               
+              # Process disks if provided
+              volumes = Array.new
+              if config.has_key?("disks") and not config.disks.empty?
+                env[:ui].info(I18n.t("vagrant_openstack.creating_disks"))
+                config.disks.each do |disk|
+                  volume = env[:openstack_compute].volumes.all.find{|v| v.name ==
+                                                          disk["name"] and 
+                                                        v.description ==
+                                                          disk["description"] and
+                                                        v.size ==
+                                                          disk["size"] and
+                                                        v.ready? }
+                  if volume
+                    env[:ui].info("re-using volume: #{disk["name"]}")
+                    disk["volume_id"] = volume.id
+                  else
+                    env[:ui].info("creating volume: #{disk["name"]}")
+                    disk["volume_id"] = env[:openstack_compute].create_volume(
+                                         disk["name"], disk["description"], disk["size"]).\
+                                         data[:body]["volume"]["id"]
+                    volumes << { :id => disk["volume_id"] }
+                  end
+
+                  # mount points are not expected to be meaningful
+                  # add useful support if your cloud respects them
+                  begin
+                    server.attach_volume(disk["volume_id"], "/dev/vd#{("a".."z").to_a[server.volume_attachments.length + 1]}")
+                    server.wait_for{ volume_attachments.any?{|vol| vol["id"]==disk["volume_id"]} }
+                  rescue Excon::Errors::Error => e
+                    raise Errors::VolumeBadState, :volume => disk["name"], :state => e.message
+                  end
+                end
+              end
+
               # store this so we can use it later
               env[:floating_ip] = floating_ip
               

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

@@ -15,6 +15,8 @@ module VagrantPlugins
           id = machine.id || env[:openstack_compute].servers.all( :name => machine.name ).first.id
 
           if id
+            volumes = env[:openstack_compute].servers.get(id).volume_attachments
+
             env[:ui].info(I18n.t("vagrant_openstack.deleting_server"))
 
             # TODO: Validate the fact that we get a server back from the API.
@@ -28,6 +30,19 @@ module VagrantPlugins
                   env[:openstack_compute].release_address(address["id"])
                 end
               end
+
+              env[:ui].info(I18n.t("vagrant_openstack.deleting_volumes"))
+              volumes.each do |compute_volume|
+                volume = env[:openstack_volume].volumes.get(compute_volume["id"])
+                if volume
+                  env[:ui].info("Deleting volume: #{volume.display_name}")
+                  begin
+                    volume.destroy
+                  rescue Excon::Errors::Error => e
+                    raise Errors::VolumeBadState, :volume => volume.display_name, :state => e.message
+                  end
+                end
+              end
             end
           end
 

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

@@ -104,6 +104,11 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :proxy
 
+      # The disks to create as OpenStack volumes.
+      #
+      # @return [Array]
+      attr_accessor :disks
+
       # Value for SSL_VERIFY_PEER, defaults to true.  Set to false for self
       # signed ssl certificate
       attr_accessor :ssl_verify_peer
@@ -139,6 +144,7 @@ module VagrantPlugins
         @region = UNSET_VALUE
         @proxy = UNSET_VALUE
         @ssl_verify_peer = UNSET_VALUE
+        @disks = UNSET_VALUE
         @orchestration_stack_name = UNSET_VALUE
         @orchestration_stack_destroy = UNSET_VALUE
         @orchestration_cfn_template = UNSET_VALUE
@@ -175,6 +181,8 @@ module VagrantPlugins
         @floating_ip = nil if @floating_ip == UNSET_VALUE
         @floating_ip = nil if @floating_ip_pool == UNSET_VALUE
 
+        @disks = nil if @disks == UNSET_VALUE
+
         @region = nil if @region == UNSET_VALUE
         @proxy = nil if @proxy == UNSET_VALUE
         @ssl_verify_peer = nil if @ssl_verify_peer == UNSET_VALUE
@@ -193,6 +201,14 @@ module VagrantPlugins
         errors << I18n.t("vagrant_openstack.config.api_key_required") if !@api_key
         errors << I18n.t("vagrant_openstack.config.username_required") if !@username
 
+        if @disks and @disks.any?{|a| not a.respond_to?("include?")}
+          errors << I18n.t("vagrant_openstack.config.disks.specification_required")
+        elsif @disks
+          errors << I18n.t("vagrant_openstack.config.disks.name_required") if @disks.any?{|a| not a.include?("name")}
+          errors << I18n.t("vagrant_openstack.config.disks.description_required") if @disks.any?{|a| not a.include?("description")}
+          errors << I18n.t("vagrant_openstack.config.disks.size_required") if @disks.any?{|a| not a.include?("size")}
+        end
+
         { "OpenStack Provider" => errors }
       end
     end

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

@@ -7,6 +7,10 @@ module VagrantPlugins
         error_namespace("vagrant_openstack.errors")
       end
 
+      class VolumeBadState < VagrantOpenStackError
+        error_key(:volume_bad_state)
+      end
+
       class CreateBadState < VagrantOpenStackError
         error_key(:create_bad_state)
       end
@@ -46,6 +50,10 @@ module VagrantPlugins
       class OrchestrationNoTemplateFileError < VagrantOpenStackError
         error_key(:orchestration_no_template_file_error)
       end
+
+      class ServerNotDestroyed < VagrantOpenStackError
+        error_key(:server_not_destroyed)
+      end
     end
   end
 end

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

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module OpenStack
-    VERSION = "0.9.1"
+    VERSION = "0.10.0"
   end
 end

data/locales/en.yml

@@ -6,8 +6,12 @@ en:
       The server is already paused.
     already_suspended: |-
       The server is already suspended.
+    creating_disks: |-
+      Creating disks with the folowing settings...
     deleting_server: |-
       Deleting server...
+    deleting_volumes: |-
+      Deleting volumes...
     finding_flavor: |-
       Finding flavor for server...
     finding_image: |-
@@ -62,8 +66,21 @@ en:
         A username is required.
       metadata_must_be_hash: |-
         Metadata must be a hash.
+      disks:
+        specification_required: |-
+          A disk specification is required for a disk configuration (array of hashes including name, description and size keys).
+        name_required: |-
+          A disk name is required for all disk specifications.
+        description_required: |-
+          A disk description is required for all disk specifications.
+        size_required: |-
+          A disk size is required for all disk specifications.
 
     errors:
+      volume_bad_state: |-
+        The OpenStack volume '%{volume}' requested is in an unexpected state:
+        '%{state}'
+        Please run `vagrant destroy` if you want to start over.
       create_bad_state: |-
         While creating the server, it transitioned to an unexpected
         state: '%{state}', instead of properly booting. Run `vagrant status`
@@ -100,6 +117,8 @@ en:
         Error: %{err}
       orchestration_no_template_file_error: |-
         Orchestration template file not found (%{fname}).
+      server_not_destroyed: |-
+        OpenStack server was not fully destroyed.
 
     states:
       short_active: |-

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

@@ -23,6 +23,7 @@ describe VagrantPlugins::OpenStack::Config do
     its(:scheduler_hints) { should be_nil }
     its(:tenant) { should be_nil }
     its(:proxy) { should be_nil }
+    its(:disks) { should be_nil }
     its(:ssl_verify_peer) { should be_nil }
   end
 
@@ -47,6 +48,11 @@ describe VagrantPlugins::OpenStack::Config do
         subject.send(attribute).should == "foo"
       end
     end
+    it "should not default disks if overridden" do
+      subject.send("disks=".to_sym, {"name" => "foo", "size" => 10, "description" => "bar"})
+      subject.finalize!
+      subject.send("disks").should == {"name" => "foo", "size" => 10, "description" => "bar"}
+    end
   end
 
   describe "validation" do
@@ -75,5 +81,13 @@ describe VagrantPlugins::OpenStack::Config do
     context "the username" do
       it "should error if not given"
     end
+
+    context "the disks" do
+      it "should not error if not given"
+      it "should error if non-array given"
+      it "should error if non-hash array element given"
+      it "should error if array element hash does not contain all three name, description or size keys"
+      it "should not error if array element hash does contain all three name, description and size keys"
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-openstack-plugin
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
 platform: ruby
 authors:
 - Edmund Haselwanter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-25 00:00:00.000000000 Z
+date: 2014-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog