vagrant-openstack-plugin 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b57c6221fd8bcfe94b1be1c952742f10224fc55
-  data.tar.gz: 6f65f3af923abc32f53ec5d22015cc5cf2fec267
+  metadata.gz: 986c84ac3194d14ea6318c89ff6266e26535afa9
+  data.tar.gz: d78d410acf7bec163dd902a614b3dedafcbe3101
 SHA512:
-  metadata.gz: 13e6a3c80a50ac260f0f2bcbae43c58f9349f5f3533f7ca62dbe7f7bb58d3d9d5212dda6a56741f5feb9704cc4869cc08dff4f27ac4420fcff423a4ab76dae80
-  data.tar.gz: 3c2bb0c482457bc42836d5f0ae4615e74f1169513d2743d7bace39d471a2b485f3ea38a972a82137fa06282d0505cef572b0987d83c20cc50343d691da68f867
+  metadata.gz: 643ff0ffe7ab2c7f9ac797ffc48a6bbb6b32786141e8d4d264f8167820699692c38584feb872b555564beb3fc5b91028910ab35ebb72aca816551e5559773078
+  data.tar.gz: b995f34d40199ec3a153cb5d63776b5cca113fd81eac5b6a498742a883cbd3dd129644e7494a293497874237d73da4aea904bd355614d2e7d649df9005f5581b

data/.gitignore

@@ -1,5 +1,6 @@
 *.gem
 *.rbc
+.idea
 .bundle
 .config
 .vagrant

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog for vagrant-openstack-plugin
 
+## 0.8.0
+
+- Merge pull request #67 from pradels/master [view commit](http://github.com///commit/15f5b5531622376df952bccc0512a6de50d7a92f)
+- Merge pull request #66 from matope/use-execute-to-make-synced_folder [view commit](http://github.com///commit/96f64a846d40e5c7f0355def17189e38895e29f3)
+- Merge pull request #72 from mathuin/fix-handlebox [view commit](http://github.com///commit/3396e33e54d2527d28a70f1487da6221cd2316e2)
+- Merge pull request #64 from bewiwi/reboot [view commit](http://github.com///commit/24bec035508853be871ed8ed73b1d33f15beff76)
+- Merge pull request #63 from bewiwi/status [view commit](http://github.com///commit/79a8c341501461a0d5ef1ce4f11cc0a1810d38f3)
+- Merge pull request #71 from bewiwi/add_openstack_snapshot_commmand [view commit](http://github.com///commit/bf4eedd6eb5e29aefe4c0e156b932b4f4a81e1f5)
+- Merge pull request #73 from detiber/configNetworks [view commit](http://github.com///commit/5e17c5aaeee7bebc4991e440565f2ee4c1b6f191)
+- Set config.networks to [] if unset [view commit](http://github.com///commit/5aad087358792bee0bd1a6a026820b04bb8ca68f)
+- Changed HandleBoxUrl to HandleBox. [view commit](http://github.com///commit/ad7b2acdea81fe6f4b50e4658ecd36762a849f74)
+- Add command snapshot [view commit](http://github.com///commit/2d207ced7e70fe206fa309ed43a8ace3eb86b327)
+- Orchestration support added. [view commit](http://github.com///commit/d4e098db8517d491adfeb826500ac3ec5384d237)
+- Avoid using sudo to make synced_folder if possible [view commit](http://github.com///commit/b5b6205fbc34e95b4dbd9c13f974b728cb27c76e)
+- Add some status messages [view commit](http://github.com///commit/0c9287bc765e074eac104e02d7a64b36bd122034)
+- Modify reload action to be a real reboot [view commit](http://github.com///commit/91f5dc65a781d062d156b912bfd9d4b84db82e44)
+
 ## 0.7.0
 
 - Merge pull request #35 from johnbellone/master [view commit](http://github.com///commit/5969261f11585e19348e903eec15617634c3c899)

data/README.md

@@ -77,6 +77,12 @@ Vagrant.configure("2") do |config|
     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)
+
+    os.orchestration_stack_name = 'stack01'				# optional
+    os.orchestration_cfn_template_file = '/tmp/cfn_heat_template.json'	# optional
+    os.orchestration_cfn_template_parameters = {			# optional
+      'NetworkName' => 'net_01'
+    } 
   end
 end
 ```
@@ -140,6 +146,18 @@ This provider exposes quite a few provider-specific configuration options:
 * `ssl_verify_peer` - sets the ssl_verify_peer on the underlying excon connection - useful for self signed certs etc.
 * `floating_ip` - Floating ip. The floating IP to assign for this instance. If
   set to :auto, then this assigns any available floating IP to the instance.
+* `orchestration_stack_name` - Name for orchestration stack. Mandatory
+  parameter when creating new stack. One of parameters for template should be
+  set with this parameter.
+* `orchestration_stack_destroy` - If stack created by vagrant should be deleted
+  when destroy action is invoked. Default value is `false`.
+* `orchestration_cfn_template` - AWS CloudFormation Template specified as a string.
+* `orchestration_cfn_template_file` - AWS CloudFormation Template file path
+  accessible for vagrant.
+* `orchestration_cfn_template_url` - AWS CloudFormation Template URL.
+* `orchestration_cfn_template_parameters` - AWS CloudFormation Template
+  parameters specified in ruby hash (take a look at example Vagrantfile).
+  This parameter is optional.
 
 These can be set like typical provider-specific configuration:
 
@@ -171,6 +189,13 @@ the remote machine over SSH.
 This is good enough for all built-in Vagrant provisioners (shell,
 chef, and puppet) to work!
 
+## Command
+
+### Snapshot
+`vagrant openstack snapshot <vmname> -n <snapshotname>`
+
+Take snapshot of ***vmname*** with name ***snapshotname***
+
 ## Contributors
 
 - [mitchellh](https://github.com/mitchellh)

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

@@ -16,6 +16,7 @@ module VagrantPlugins
             if env[:result]
               b1.use ConnectOpenStack
               b1.use DeleteServer
+              b1.use DeleteOrchestrationStack
             else
               b1.use MessageWillNotDestroy
             end
@@ -86,12 +87,13 @@ module VagrantPlugins
       # This action is called when `vagrant up` is executed.
       def self.action_up
         Vagrant::Action::Builder.new.tap do |b|
-          b.use HandleBoxUrl
+          b.use HandleBox
           b.use ConfigValidate
           b.use Call, IsCreated do |env, b1|
             unless env[:result]
               b1.use action_prepare_boot
               b1.use ConnectOpenStack
+              b1.use CreateOrchestrationStack
               b1.use CreateServer
             else
               b1.use action_resume
@@ -125,14 +127,12 @@ module VagrantPlugins
           b.use Call, IsPaused do |env, b1|
             unless env[:result]
               b1.use Call, IsSuspended do |env2, b2|
-                b1.use action_halt unless env2[:result]
+                b2.use RebootServer
               end
             end
 
-            b1.use Call, WaitForState, [:paused, :suspended], 120 do |env2, b2|
-              if env2[:result]
-                b2.use action_up
-              else
+            b1.use Call, WaitForState, [:active], 120 do |env2, b2|
+              unless env2[:result]
                 b2.use HardRebootServer
               end
             end
@@ -198,6 +198,34 @@ module VagrantPlugins
         end
       end
 
+      def self.action_take_snapshot
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use Call, IsCreated do |env, b1|
+            if env[:result]
+              b1.use ConnectOpenStack
+              b1.use Call, IsSnapshoting do |env,b2|
+                if env[:result]
+                  b2.use MessageSnapshotInProgress
+                else
+                  b2.use TakeSnapshot
+                end
+
+                b2.use Call, WaitForTask, [nil], 1200 do |env3, b3|
+                  if env3[:result]
+                    b3.use MessageSnapshotDone
+                  end
+                end
+
+
+              end
+            else
+              b1.use MessageNotCreated
+            end
+          end
+        end
+      end
+
       # The autoload farm
       action_root = Pathname.new(File.expand_path("../action", __FILE__))
       autoload :ConnectOpenStack, action_root.join("connect_openstack")
@@ -206,12 +234,15 @@ module VagrantPlugins
       autoload :HardRebootServer, action_root.join("hard_reboot_server")
       autoload :IsCreated, action_root.join("is_created")
       autoload :IsPaused, action_root.join("is_paused")
+      autoload :IsSnapshoting, action_root.join("is_snapshoting")
       autoload :IsSuspended, action_root.join("is_suspended")
       autoload :MessageAlreadyCreated, action_root.join("message_already_created")
       autoload :MessageAlreadyPaused, action_root.join("message_already_paused")
       autoload :MessageAlreadySuspended, action_root.join("message_already_suspended")
       autoload :MessageNotCreated, action_root.join("message_not_created")
       autoload :MessageNotSuspended, action_root.join("message_not_suspended")
+      autoload :MessageSnapshotDone, action_root.join("message_snapshot_done")
+      autoload :MessageSnapshotInProgress, action_root.join("message_snapshot_in_progress")
       autoload :MessageWillNotDestroy, action_root.join("message_will_not_destroy")
       autoload :MessageServerRunning, action_root.join("message_server_running")
       autoload :PauseServer, action_root.join("pause_server")
@@ -221,8 +252,12 @@ module VagrantPlugins
       autoload :ResumeServer, action_root.join("resume_server")
       autoload :SuspendServer, action_root.join("suspend_server")      
       autoload :SyncFolders, action_root.join("sync_folders")
+      autoload :TakeSnapshot, action_root.join("take_snapshot")
       autoload :WaitForState, action_root.join("wait_for_state")
+      autoload :WaitForTask, action_root.join("wait_for_task")
       autoload :WarnNetworks, action_root.join("warn_networks")
+      autoload :CreateOrchestrationStack, action_root.join("create_orchestration_stack")
+      autoload :DeleteOrchestrationStack, action_root.join("delete_orchestration_stack")
     end
   end
 end

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

@@ -29,17 +29,22 @@ module VagrantPlugins
             :ssl_verify_peer => config.ssl_verify_peer
           }
 
-          @logger.info("Connecting to OpenStack...")
-          @logger.debug("API connection params: #{connection_options.inspect}")
-          env[:openstack_compute] = Fog::Compute.new({
-            :provider => :openstack,
+          # Prepare connection parameters for use with fog service
+          # initialization (compute, storage, orchestration, ...).
+          env[:fog_openstack_params] = {
+            :provider           => :openstack,
             :connection_options => connection_options,
             :openstack_username => username,
-            :openstack_api_key => api_key,
+            :openstack_api_key  => api_key,
             :openstack_auth_url => endpoint,
-            :openstack_tenant => tenant,
-            :openstack_region => region
-          })
+            :openstack_tenant   => tenant,
+            :openstack_region   => region
+          }
+
+          @logger.info("Connecting to OpenStack...")
+          @logger.debug("API connection params: #{connection_options.inspect}")
+          env[:openstack_compute] = Fog::Compute.new(
+            env[:fog_openstack_params])
 
           if config.networks && !config.networks.empty?
             env[:openstack_network] = Fog::Network.new({

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

@@ -0,0 +1,97 @@
+require "fog"
+require "log4r"
+
+module VagrantPlugins
+  module OpenStack
+    module Action
+      class CreateOrchestrationStack
+
+        def initialize(app, env)
+          @app    = app
+          @logger = Log4r::Logger.new(
+            "vagrant_openstack::action::create_orchestration_stack")
+        end
+
+        def call(env)
+          # Get the config.
+          config = env[:machine].provider_config
+
+          # Are we going to handle orchestration stacks?
+          if not config.orchestration_stack_name
+            return @app.call(env)
+          end
+
+          # Create new fog orchestration service.
+          env[:openstack_orchestration] = Fog::Orchestration.new(
+            env[:fog_openstack_params])
+
+          # Check if stack is already created.
+          env[:openstack_orchestration].list_stacks.body['stacks'].each do |stack|
+            if config.orchestration_stack_name == stack['stack_name']
+              return @app.call(env)
+            end
+          end
+
+          # To avoid confusion, only one source for orchestration template
+          # should be set.
+          if [config.orchestration_cfn_template,
+              config.orchestration_cfn_template_file,
+              config.orchestration_cfn_template_url].count(nil) != 2
+            raise Errors::OrchestrationTemplateError,
+              :err => 'One source for orchestration template should be specified.'
+          end
+
+          # Prepare parameters for new orchestration stack.
+          # TODO: configurable parameters
+          stack_params = {
+            :disable_rollback   => false,
+            :timeout_in_minutes => 5,
+          }
+
+          # Set template source.
+          if config.orchestration_cfn_template
+            stack_params[:template] = config.orchestration_cfn_template
+          elsif config.orchestration_cfn_template_file
+            if not File.exist?(config.orchestration_cfn_template_file)
+              raise Errors::OrchestrationNoTemplateFileError,
+                :fname => config.orchestration_cfn_template_file
+            end
+
+            # Load template file content. Newlines can cause parse error of
+            # input JSON string.
+            stack_params[:template] = ''
+            File.open(config.orchestration_cfn_template_file) { |file|
+              file.each_line do |line|
+                stack_params[:template] << line
+              end
+            }
+          else
+            stack_params[:template_url] = config.orchestration_cfn_template_url
+          end
+
+          # Set template parameters.
+          stack_params[:parameters] = config.orchestration_cfn_template_parameters
+
+          # Create new stack.
+          env[:ui].info(I18n.t("vagrant_openstack.creating_orchestration_stack"))
+          stack = env[:openstack_orchestration].create_stack(
+            config.orchestration_stack_name, stack_params)
+
+          # Write UUID of newly created stack into file for later use (stack removal).
+          created_stacks_fname = env[:machine].data_dir + 'orchestration_stacks'
+          message = 'Saving information about created orchestration stack '
+          message << "#{config.orchestration_stack_name}, "
+          message << "UUID=#{stack.body['stack']['id']} "
+          message << "to file #{created_stacks_fname}."
+          @logger.info(message)
+
+          File.open(created_stacks_fname, 'a') do |file|
+            file.puts stack.body['stack']['id']
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -49,6 +49,8 @@ module VagrantPlugins
           unless config.networks
             if config.network
               config.networks = [ config.network ]
+            else
+              config.networks = []
             end
           end
 

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

@@ -0,0 +1,78 @@
+require "fog"
+require "log4r"
+
+module VagrantPlugins
+  module OpenStack
+    module Action
+      class DeleteOrchestrationStack
+
+        def initialize(app, env)
+          @app    = app
+          @logger = Log4r::Logger.new(
+            "vagrant_openstack::action::delete_orchestration_stack")
+        end
+
+        def call(env)
+          # Get the config.
+          config = env[:machine].provider_config
+
+          # Load IDs for orchestration stacks created by vagrant and this
+          # project.
+          created_stacks_fname = env[:machine].data_dir + 'orchestration_stacks'
+
+          # Return if no action is needed. 
+          if not config.orchestration_stack_destroy or not File.exist?(created_stacks_fname)
+            env[:machine].id = nil
+            return @app.call(env)
+          end
+
+          # Create new fog orchestration service.
+          env[:openstack_orchestration] = Fog::Orchestration.new(
+            env[:fog_openstack_params])
+
+          # Load IDs of stacks to be deleted.
+          available_stacks = env[:openstack_orchestration].list_stacks.body['stacks']
+          stacks_to_delete = []
+          File.open(created_stacks_fname) { |file|
+            file.each_line do |stack_id|
+              stack = find_stack(available_stacks, stack_id.chomp!)
+              next if not stack
+              stacks_to_delete << stack
+            end
+          }
+
+          # Delete stacks.
+          if stacks_to_delete.length > 0
+            env[:ui].info(I18n.t("vagrant_openstack.deleting_orchestration_stacks"))
+          end
+
+          stacks_to_delete.each do |stack|
+            @logger.info("Removing orchestration stack #{stack['stack_name']} (#{stack['id']}).")
+            env[:openstack_orchestration].delete_stack(
+              stack['stack_name'], stack['id'])
+
+            stacks_from_file.delete(stack)
+          end
+
+          # Delete file holding created stack IDs.
+          @logger.info("Deleting file #{created_stacks_fname}.")
+          File.delete(created_stacks_fname)
+
+          env[:machine].id = nil
+          @app.call(env)
+        end
+
+        private
+
+        def find_stack(available_stacks, stack_id)
+          available_stacks.each do |stack|
+            if stack['id'] == stack_id
+              return stack
+            end
+          end
+          false
+        end
+      end
+    end
+  end
+end

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

@@ -20,7 +20,6 @@ module VagrantPlugins
             # TODO: Validate the fact that we get a server back from the API.
             server = env[:openstack_compute].servers.get(id)
             server.destroy
-            env[:machine].id = nil
           end
 
           @app.call(env)

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

@@ -0,0 +1,24 @@
+module VagrantPlugins
+  module OpenStack
+    module Action
+      class IsSnapshoting
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          if env[:machine].id
+            infos = env[:openstack_compute].get_server_details(env[:machine].id)
+            task = infos.body['server']['OS-EXT-STS:task_state']
+            if task == 'image_snapshot' || task == 'image_pending_upload'
+              env[:result] = true
+            else
+              env[:result] = false
+            end
+          end
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -1,5 +1,5 @@
 module VagrantPlugins
-  module OpenStack
+module OpenStack
     module Action
       class MessageAlreadyCreated
         def initialize(app, env)

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

@@ -0,0 +1,16 @@
+module VagrantPlugins
+module OpenStack
+    module Action
+      class MessageSnapshotDone
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          env[:ui].info(I18n.t("vagrant_openstack.snapshot_done"))
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module VagrantPlugins
+module OpenStack
+    module Action
+      class MessageSnapshotInProgress
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          env[:ui].info(I18n.t("vagrant_openstack.snapshot_in_progress"))
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -37,9 +37,15 @@ module VagrantPlugins
                                 :guestpath => guestpath))
 
             # Create the guest path
-            env[:machine].communicate.sudo("mkdir -p '#{guestpath}'")
-            env[:machine].communicate.sudo(
-              "chown #{ssh_info[:username]} '#{guestpath}'")
+            # Use sudo only when it is necessary 
+            cmd_mkdir = "mkdir -p '#{guestpath}'"
+            cmd_chown = "chown #{ssh_info[:username]} '#{guestpath}'"
+            if env[:machine].communicate.execute(cmd_mkdir, :error_check => false) != 0 then
+              env[:machine].communicate.sudo(cmd_mkdir)
+            end
+            if env[:machine].communicate.execute(cmd_chown, :error_check => false) != 0 then
+              env[:machine].communicate.sudo(cmd_chown)
+            end
 
             #collect rsync excludes specified :rsync_excludes=>['path1',...] in synced_folder options
             excludes = ['.vagrant/', 'Vagrantfile', *Array(data[:rsync_excludes])].uniq

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

@@ -0,0 +1,26 @@
+require "log4r"
+
+module VagrantPlugins
+  module OpenStack
+    module Action
+      # This reboots a running server, if there is one.
+      class TakeSnapshot
+        def initialize(app, env)
+          @app    = app
+          @logger = Log4r::Logger.new("vagrant_openstack::action::take_snapshot")
+        end
+
+        def call(env)
+          if env[:machine].id
+            env[:ui].info(I18n.t("vagrant_openstack.snapshoting_server"))
+            infos = env[:openstack_compute].get_server_details(env[:machine].id)
+            env[:openstack_compute].create_image(env[:machine].id,env[:openstack_snapshot_name] || 'snapshot')
+
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,44 @@
+# coding: utf-8
+require 'log4r'
+require 'timeout'
+
+module VagrantPlugins
+  module OpenStack
+    module Action
+      # This action will wait for a machine to reach a specific state or quit by timeout.
+      class WaitForTask
+        def initialize(app, env, task, timeout)
+          @app = app
+          @logger = Log4r::Logger.new('vagrant_openstack::action::wait_for_task')
+          @task = Array.new(task).flatten
+          @timeout = timeout
+        end
+
+        def call(env)
+          env[:result] = true
+          task = get_task(env)
+
+          if @task.include?(task)
+            @logger.info("Machine already at task #{ task.to_s }")
+          else
+            @logger.info("Waiting for machine to reach task...")
+            begin
+              Timeout.timeout(@timeout) do
+                sleep 5 until @task.include?(get_task(env))
+              end
+            rescue Timeout::Error
+              env[:result] = false
+            end
+
+            @app.call(env)
+          end
+        end
+
+        def get_task(env)
+          infos = env[:openstack_compute].get_server_details(env[:machine].id)
+          infos.body['server']['OS-EXT-STS:task_state']
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,70 @@
+require "vagrant"
+require "vagrant/action/builder"
+require "pathname"
+
+module VagrantPlugins
+  module OpenStack
+    module Action
+
+      class Command < Vagrant.plugin(2, :command)
+
+        include Vagrant::Action::Builtin
+#        include VagrantPlugins::OpenStack::Action
+
+        def initialize(argv, env)
+          super
+
+          @main_args, @sub_command, @sub_args = split_main_and_subcommand(argv)
+
+          @subcommands = Vagrant::Registry.new
+          @subcommands.register(:snapshot) do
+            require_relative 'command/command_snapshot'
+            CommandTakeSnapshot
+          end
+        end
+
+
+
+        def execute
+          if @main_args.include?("-h") || @main_args.include?("--help")
+            # Print the help for all the sub-commands.
+            return help
+          end
+
+          # If we reached this far then we must have a subcommand. If not,
+          # then we also just print the help and exit.
+          command_class = @subcommands.get(@sub_command.to_sym) if @sub_command
+          return help if !command_class || !@sub_command
+          @logger.debug("Invoking command class: #{command_class} #{@sub_args.inspect}")
+
+          # Initialize and execute the command class
+          command_class.new(@sub_args, @env).execute
+        end
+
+        # Prints the help out for this command
+        def help
+          opts = OptionParser.new do |o|
+            o.banner = "Usage: vagrant openstack <command> [<args>]"
+            o.separator ""
+            o.separator "Available subcommands:"
+
+            # Add the available subcommands as separators in order to print them
+            # out as well.
+            keys = []
+            @subcommands.each { |key, value| keys << key.to_s }
+
+            keys.sort.each do |key|
+              o.separator "     #{key}"
+            end
+
+            o.separator ""
+            o.separator "For help on any individual command run `vagrant openstack <command> -h`"
+          end
+
+          @env.ui.info(opts.help, :prefix => false)
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+require "vagrant"
+require "vagrant/action/builder"
+require "pathname"
+require "vagrant-openstack-plugin/action"
+
+
+module VagrantPlugins
+  module OpenStack
+    module Action
+      class CommandTakeSnapshot < Vagrant.plugin("2", :command)
+        include Vagrant::Action::Builtin
+
+        def execute
+          options = {:openstack_snapshot_name => 'snapshot'}
+          opts = OptionParser.new do |opts|
+            opts.banner = "Enters openstack"
+            opts.separator ""
+            opts.separator "Usage: vagrant openstack snapshot <vmname> -n <snapshotname>"
+
+
+            opts.on( '-n', '--name NAME', 'snapshotname' ) do |name|
+              options[:openstack_snapshot_name] = name
+            end
+
+          end
+
+          # Parse the options
+          argv = parse_options(opts)
+
+          return if !argv
+
+
+          with_target_vms(argv, :reverse => true) do |vm|
+            if vm.provider.to_s == VagrantPlugins::OpenStack::Provider.new(nil).to_s
+              vm.action(:take_snapshot,options)
+            end
+          end
+        end
+      end
+
+    end
+  end
+end

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

@@ -103,6 +103,14 @@ module VagrantPlugins
       # signed ssl certificate
       attr_accessor :ssl_verify_peer
 
+      # Heat orchestration configuration parameters.
+      attr_accessor :orchestration_stack_name
+      attr_accessor :orchestration_stack_destroy
+      attr_accessor :orchestration_cfn_template
+      attr_accessor :orchestration_cfn_template_file
+      attr_accessor :orchestration_cfn_template_url
+      attr_accessor :orchestration_cfn_template_parameters
+
       def initialize
         @api_key  = UNSET_VALUE
         @endpoint = UNSET_VALUE
@@ -125,6 +133,12 @@ module VagrantPlugins
         @region = UNSET_VALUE
         @proxy = UNSET_VALUE
         @ssl_verify_peer = UNSET_VALUE
+        @orchestration_stack_name = UNSET_VALUE
+        @orchestration_stack_destroy = UNSET_VALUE
+        @orchestration_cfn_template = UNSET_VALUE
+        @orchestration_cfn_template_file = UNSET_VALUE
+        @orchestration_cfn_template_url = UNSET_VALUE
+        @orchestration_cfn_template_parameters = UNSET_VALUE
       end
 
       def finalize!
@@ -157,6 +171,13 @@ module VagrantPlugins
         @region = nil if @region == UNSET_VALUE
         @proxy = nil if @proxy == UNSET_VALUE
         @ssl_verify_peer = nil if @ssl_verify_peer == UNSET_VALUE
+
+        @orchestration_stack_name = nil if @orchestration_stack_name == UNSET_VALUE
+        @orchestration_stack_destroy = false if @orchestration_stack_destroy == UNSET_VALUE
+        @orchestration_cfn_template = nil if @orchestration_cfn_template == UNSET_VALUE
+        @orchestration_cfn_template_file = nil if @orchestration_cfn_template_file == UNSET_VALUE
+        @orchestration_cfn_template_url = nil if @orchestration_cfn_template_url == UNSET_VALUE
+        @orchestration_cfn_template_parameters = nil if @orchestration_cfn_template_parameters == UNSET_VALUE
       end
 
       def validate(machine)

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

@@ -34,6 +34,14 @@ module VagrantPlugins
       class FloatingIPNotFound < VagrantOpenStackError
         error_key(:floating_ip_not_found)
       end
+
+      class OrchestrationTemplateError < VagrantOpenStackError
+        error_key(:orchestration_template_error)
+      end
+
+      class OrchestrationNoTemplateFileError < VagrantOpenStackError
+        error_key(:orchestration_no_template_file_error)
+      end
     end
   end
 end

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

@@ -12,25 +12,33 @@ end
 
 module VagrantPlugins
   module OpenStack
-    class Plugin < Vagrant.plugin("2")
-      name "OpenStack Cloud"
-      description <<-DESC
+    module Action
+      class Plugin < Vagrant.plugin("2")
+        name "OpenStack Cloud"
+        description <<-DESC
       This plugin enables Vagrant to manage machines in OpenStack Cloud.
-      DESC
+        DESC
 
-      config(:openstack, :provider) do
-        require_relative "config"
-        Config
-      end
+        config(:openstack, :provider) do
+          require_relative "config"
+          Config
+        end
+
+        provider(:openstack, parallel: true) do
+          # Setup some things
+          OpenStack.init_i18n
+          OpenStack.init_logging
+
+          # Load the actual provider
+          require_relative "provider"
+          Provider
+        end
 
-      provider(:openstack, parallel: true) do
-        # Setup some things
-        OpenStack.init_i18n
-        OpenStack.init_logging
+        command "openstack" do
+          require_relative "command"
+          Command
+        end
 
-        # Load the actual provider
-        require_relative "provider"
-        Provider
       end
     end
   end

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

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module OpenStack
-    VERSION = "0.7.0"
+    VERSION = "0.8.0"
   end
 end

data/locales/en.yml

@@ -26,6 +26,12 @@ en:
       The server is ready!
     rebooting_server: |-
       This server instance is rebooting!
+    snapshoting_server: |-
+      This server instance is snapshoting!
+    snapshot_done: |-
+      Snapshot is ok
+    snapshot_in_progress: |-
+      Snapshot is in progress
     resuming_server: |-
       The server instance has been resumed.
     rsync_folder: |-
@@ -45,7 +51,10 @@ en:
     will_not_destroy: |-
         The instance '%{name}' will not be destroyed, since the confirmation
         was declined.
-
+    creating_orchestration_stack: |-
+        Creating orchestration stack...
+    deleting_orchestration_stacks: |-
+        Deleting orchestration stacks...
     config:
       api_key_required: |-
         An API key is required.
@@ -84,6 +93,12 @@ en:
       floating_ip_not_found: |-
         A floating IP could not be allocated, as no available floating 
         IPs were found in OpenStack
+      orchestration_template_error: |-
+        There was an error while reading orchestration template.
+        Error: %{err}
+      orchestration_no_template_file_error: |-
+        Orchestration template file not found (%{fname}).
+
     states:
       short_active: |-
         active
@@ -91,6 +106,12 @@ en:
         The server is up and running. Run `vagrant ssh` to access it.
       short_build: |-
         building
+      short_suspended: |-
+        suspended
+      short_paused: |-
+        paused
+      short_shutoff: |-
+        shutdown
       long_build: |-
         The server is currently being built. You must wait for this to
         complete before you can access it. You can delete the server, however,

data/vagrant-openstack-plugin.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.summary       = "Enables Vagrant to manage machines in OpenStack Cloud."
   gem.homepage      = "http://www.vagrantup.com"
 
-  gem.add_runtime_dependency "fog", ">= 1.10.1"
+  gem.add_runtime_dependency "fog", ">= 1.16.0"
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec", "~> 2.13.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-openstack-plugin
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Edmund Haselwanter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-05 00:00:00.000000000 Z
+date: 2014-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: 1.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: 1.16.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -73,17 +73,22 @@ files:
 - lib/vagrant-openstack-plugin.rb
 - lib/vagrant-openstack-plugin/action.rb
 - lib/vagrant-openstack-plugin/action/connect_openstack.rb
+- lib/vagrant-openstack-plugin/action/create_orchestration_stack.rb
 - lib/vagrant-openstack-plugin/action/create_server.rb
+- lib/vagrant-openstack-plugin/action/delete_orchestration_stack.rb
 - lib/vagrant-openstack-plugin/action/delete_server.rb
 - lib/vagrant-openstack-plugin/action/hard_reboot_server.rb
 - lib/vagrant-openstack-plugin/action/is_created.rb
 - lib/vagrant-openstack-plugin/action/is_paused.rb
+- lib/vagrant-openstack-plugin/action/is_snapshoting.rb
 - lib/vagrant-openstack-plugin/action/is_suspended.rb
 - lib/vagrant-openstack-plugin/action/message_already_created.rb
 - lib/vagrant-openstack-plugin/action/message_already_paused.rb
 - lib/vagrant-openstack-plugin/action/message_already_suspended.rb
 - lib/vagrant-openstack-plugin/action/message_not_created.rb
 - lib/vagrant-openstack-plugin/action/message_server_running.rb
+- lib/vagrant-openstack-plugin/action/message_snapshot_done.rb
+- lib/vagrant-openstack-plugin/action/message_snapshot_in_progress.rb
 - lib/vagrant-openstack-plugin/action/message_will_not_destroy.rb
 - lib/vagrant-openstack-plugin/action/pause_server.rb
 - lib/vagrant-openstack-plugin/action/read_ssh_info.rb
@@ -92,8 +97,12 @@ files:
 - lib/vagrant-openstack-plugin/action/resume_server.rb
 - lib/vagrant-openstack-plugin/action/suspend_server.rb
 - lib/vagrant-openstack-plugin/action/sync_folders.rb
+- lib/vagrant-openstack-plugin/action/take_snapshot.rb
 - lib/vagrant-openstack-plugin/action/wait_for_state.rb
+- lib/vagrant-openstack-plugin/action/wait_for_task.rb
 - lib/vagrant-openstack-plugin/action/warn_networks.rb
+- lib/vagrant-openstack-plugin/command.rb
+- lib/vagrant-openstack-plugin/command/command_snapshot.rb
 - lib/vagrant-openstack-plugin/config.rb
 - lib/vagrant-openstack-plugin/errors.rb
 - lib/vagrant-openstack-plugin/plugin.rb