vagrant-openstack-provider 0.5.2 → 0.6.0

data/lib/vagrant-openstack-provider/action/delete_stack.rb

@@ -0,0 +1,72 @@
+require 'log4r'
+require 'socket'
+require 'timeout'
+require 'sshkey'
+require 'yaml'
+
+require 'vagrant-openstack-provider/config_resolver'
+require 'vagrant-openstack-provider/utils'
+require 'vagrant-openstack-provider/action/abstract_action'
+require 'vagrant/util/retryable'
+
+module VagrantPlugins
+  module Openstack
+    module Action
+      class DeleteStack < AbstractAction
+        def initialize(app, _env)
+          @app = app
+          @logger = Log4r::Logger.new('vagrant_openstack::action::delete_stack')
+        end
+
+        def execute(env)
+          @logger.info 'Start delete stacks action'
+
+          heat = env[:openstack_client].heat
+
+          list_stack_files(env).each do |stack|
+            env[:ui].info(I18n.t('vagrant_openstack.delete_stack'))
+            env[:ui].info(" -- Stack Name : #{stack[:name]}")
+            env[:ui].info(" -- Stack Id   : #{stack[:id]}")
+
+            heat.delete_stack(env, stack[:name], stack[:id])
+
+            waiting_for_stack_to_be_deleted(env, stack[:name], stack[:id])
+          end
+
+          # This will remove all files in the .vagrant instance directory
+          env[:machine].id = nil
+
+          @app.call(env)
+        end
+
+        private
+
+        def list_stack_files(env)
+          stack_files = []
+          Dir.glob("#{env[:machine].data_dir}/stack_*_id") do |stack_file|
+            file_name = stack_file.split('/')[-1]
+            stack_files << {
+              name: file_name[6, (file_name.length) - 9],
+              id: File.read("#{stack_file}")
+            }
+          end
+          stack_files
+        end
+
+        def waiting_for_stack_to_be_deleted(env, stack_name, stack_id, retry_interval = 3, timeout = 200)
+          @logger.info "Waiting for the stack with id #{stack_id} to be deleted..."
+          env[:ui].info(I18n.t('vagrant_openstack.waiting_for_stack_deleted'))
+          timeout(timeout, Errors::Timeout) do
+            stack_status = 'DELETE_IN_PROGRESS'
+            until stack_status == 'DELETE_COMPLETE'
+              @logger.debug('Waiting for stack to be DELETED')
+              stack_status = env[:openstack_client].heat.get_stack_details(env, stack_name, stack_id)['stack_status']
+              fail Errors::StackStatusError, stack: stack_id if stack_status == 'DELETE_FAILED'
+              sleep retry_interval
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-openstack-provider/action/message.rb

@@ -1,13 +1,15 @@
+require 'vagrant-openstack-provider/action/abstract_action'
+
 module VagrantPlugins
   module Openstack
     module Action
-      class Message
+      class Message < AbstractAction
         def initialize(app, _env, message)
           @app = app
           @message = message
         end
 
-        def call(env)
+        def execute(env)
           env[:ui].info(@message)
           @app.call(env)
         end

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

@@ -2,13 +2,15 @@ require 'log4r'
 
 require 'vagrant-openstack-provider/config_resolver'
 require 'vagrant-openstack-provider/utils'
+require 'vagrant-openstack-provider/action/abstract_action'
 
 module VagrantPlugins
   module Openstack
     module Action
       # This action reads the SSH info for the machine and puts it into the
       # `:machine_ssh_info` key in the environment.
-      class ReadSSHInfo
+
+      class ReadSSHInfo < AbstractAction
         def initialize(app, _env, resolver = ConfigResolver.new, utils = Utils.new)
           @app    = app
           @logger = Log4r::Logger.new('vagrant_openstack::action::read_ssh_info')
@@ -16,7 +18,7 @@ module VagrantPlugins
           @utils = utils
         end
 
-        def call(env)
+        def execute(env)
           @logger.info 'Reading SSH info'
           server_id = env[:machine].id.to_sym
           SSHInfoHolder.instance.tap do |holder|

data/lib/vagrant-openstack-provider/action/read_state.rb

@@ -1,17 +1,19 @@
 require 'log4r'
 
+require 'vagrant-openstack-provider/action/abstract_action'
+
 module VagrantPlugins
   module Openstack
     module Action
       # This action reads the state of the machine and puts it in the
       # `:machine_state_id` key in the environment.
-      class ReadState
+      class ReadState < AbstractAction
         def initialize(app, _env)
           @app    = app
           @logger = Log4r::Logger.new('vagrant_openstack::action::read_state')
         end
 
-        def call(env)
+        def execute(env)
           env[:machine_state_id] = read_state(env)
           @app.call(env)
         end
@@ -29,8 +31,11 @@ module VagrantPlugins
             return :not_created
           end
 
-          # Return the state
-          server['status'].downcase.to_sym
+          if !server['OS-EXT-STS:task_state'].nil?
+            server['OS-EXT-STS:task_state'].downcase.to_sym
+          else
+            server['status'].downcase.to_sym
+          end
         end
       end
     end

data/lib/vagrant-openstack-provider/action/resume.rb

@@ -1,13 +1,15 @@
+require 'vagrant-openstack-provider/action/abstract_action'
+
 module VagrantPlugins
   module Openstack
     module Action
-      class Resume
+      class Resume < AbstractAction
         def initialize(app, _env)
           @app = app
           @logger = Log4r::Logger.new('vagrant_openstack::action::resume_server')
         end
 
-        def call(env)
+        def execute(env)
           if env[:machine].id
             @logger.info "Resuming suspended VM #{env[:machine].id}..."
             env[:ui].info I18n.t('vagrant.actions.vm.resume.resuming')

data/lib/vagrant-openstack-provider/action/start_server.rb

@@ -1,15 +1,17 @@
 require 'log4r'
 
+require 'vagrant-openstack-provider/action/abstract_action'
+
 module VagrantPlugins
   module Openstack
     module Action
-      class StartServer
+      class StartServer < AbstractAction
         def initialize(app, _env)
           @app    = app
           @logger = Log4r::Logger.new('vagrant_openstack::action::start_server')
         end
 
-        def call(env)
+        def execute(env)
           if env[:machine].id
             env[:ui].info(I18n.t('vagrant_openstack.starting_server'))
             env[:openstack_client].nova.start_server(env, env[:machine].id)

data/lib/vagrant-openstack-provider/action/stop_server.rb

@@ -1,15 +1,17 @@
 require 'log4r'
 
+require 'vagrant-openstack-provider/action/abstract_action'
+
 module VagrantPlugins
   module Openstack
     module Action
-      class StopServer
+      class StopServer < AbstractAction
         def initialize(app, _env)
           @app    = app
           @logger = Log4r::Logger.new('vagrant_openstack::action::stop_server')
         end
 
-        def call(env)
+        def execute(env)
           if env[:machine].id
             @logger.info "Stopping server #{env[:machine].id}..."
             env[:ui].info(I18n.t('vagrant_openstack.stopping_server'))

data/lib/vagrant-openstack-provider/action/suspend.rb

@@ -1,13 +1,15 @@
+require 'vagrant-openstack-provider/action/abstract_action'
+
 module VagrantPlugins
   module Openstack
     module Action
-      class Suspend
+      class Suspend < AbstractAction
         def initialize(app, _env)
           @app = app
           @logger = Log4r::Logger.new('vagrant_openstack::action::suspend_server')
         end
 
-        def call(env)
+        def execute(env)
           if env[:machine].id
             @logger.info "Saving VM #{env[:machine].id} state and suspending execution..."
             env[:ui].info I18n.t('vagrant.actions.vm.suspend.suspending')

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

@@ -2,19 +2,20 @@ require 'log4r'
 require 'rbconfig'
 require 'vagrant/util/subprocess'
 
+require 'vagrant-openstack-provider/action/abstract_action'
+
 module VagrantPlugins
   module Openstack
     module Action
-      class SyncFolders
+      class SyncFolders < AbstractAction
         def initialize(app, _env)
           @app = app
         end
 
-        def call(env)
+        def execute(env)
           sync_method = env[:machine].provider_config.sync_method
-          ssh_disabled = env[:machine].provider_config.ssh_disabled
-          if sync_method == 'none' || ssh_disabled
-            NoSyncFolders.new(@app, env, ssh_disabled).call(env)
+          if sync_method == 'none'
+            NoSyncFolders.new(@app, env).call(env)
           elsif sync_method == 'rsync'
             RsyncFolders.new(@app, env).call(env)
           else
@@ -24,15 +25,13 @@ module VagrantPlugins
       end
 
       class NoSyncFolders
-        def initialize(app, _env, ssh_disabled)
+        def initialize(app, _env)
           @app = app
-          @ssh_disabled = ssh_disabled
         end
 
         def call(env)
           @app.call(env)
-          env[:ui].info('Folders will not be synced because provider config ssh_disabled is set to true') if @ssh_disabled
-          env[:ui].info('Sync folders are disabled in the provider configuration') unless @ssh_disabled
+          env[:ui].info(I18n.t('vagrant_openstack.disabled_sync_folders'))
         end
       end
 
@@ -48,6 +47,11 @@ module VagrantPlugins
         def call(env)
           @app.call(env)
 
+          if env[:machine].provider_config.ssh_disabled
+            env[:ui].info(I18n.t('vagrant_openstack.ssh_disabled_sync_folders'))
+            return
+          end
+
           ssh_info = env[:machine].ssh_info
 
           config          = env[:machine].provider_config
@@ -93,14 +97,14 @@ module VagrantPlugins
               "#{ssh_info[:username]}@#{ssh_info[:host]}:#{guestpath}"]
             command.compact!
 
-            # during rsync, ignore files specified in .hgignore and
-            # .gitignore traditional .gitignore or .hgignore files
-            ignore_files = ['.hgignore', '.gitignore']
+            # during rsync, ignore files specified in list of files containing exclude patterns
+            # ex: rsync_ignore_files = ['.hgignore', '.gitignore']
+            ignore_files = []
+            ignore_files = env[:machine].provider_config.rsync_ignore_files unless env[:machine].provider_config.rsync_ignore_files.nil?
             ignore_files.each do |ignore_file|
               abs_ignore_file = env[:root_path].to_s + '/' + ignore_file
               command += ['--exclude-from', abs_ignore_file] if File.exist?(abs_ignore_file)
             end
-
             r = Vagrant::Util::Subprocess.execute(*command)
             next if r.exit_code == 0
             fail Errors::RsyncError, guestpath: guestpath, hostpath: hostpath, stderr: r.stderr

data/lib/vagrant-openstack-provider/action/wait_accessible.rb

@@ -3,7 +3,7 @@ require 'log4r'
 module VagrantPlugins
   module Openstack
     module Action
-      class WaitForServerToBeAccessible
+      class WaitForServerToBeAccessible < AbstractAction
         def initialize(app, env, resolver = nil, ssh = nil)
           @logger   = Log4r::Logger.new('vagrant_openstack::action::wait_accessible')
           @app      = app
@@ -11,7 +11,7 @@ module VagrantPlugins
           @resolver = resolver || VagrantPlugins::Openstack::ConfigResolver.new
         end
 
-        def call(env)
+        def execute(env)
           waiting_for_server_to_be_reachable(env)
           @logger.info 'The server is ready'
           env[:ui].info(I18n.t('vagrant_openstack.ready'))
@@ -41,6 +41,9 @@ module VagrantPlugins
             end
 
             env[:ssh_run_command] = 'exit 0'
+            env[:ssh_opts] = {
+              extra_args: ['-o', 'BatchMode=yes']
+            }
             @ssh.call(env)
             return true if env[:ssh_run_exit_status] == 0
 

data/lib/vagrant-openstack-provider/action/wait_active.rb

@@ -1,10 +1,12 @@
 require 'log4r'
 require 'timeout'
 
+require 'vagrant-openstack-provider/action/abstract_action'
+
 module VagrantPlugins
   module Openstack
     module Action
-      class WaitForServerToBeActive
+      class WaitForServerToBeActive < AbstractAction
         def initialize(app, _env, retry_interval = 3, timeout = 200)
           @app    = app
           @logger = Log4r::Logger.new('vagrant_openstack::action::start_server')
@@ -12,11 +14,11 @@ module VagrantPlugins
           @timeout = timeout
         end
 
-        def call(env)
+        def execute(env)
           if env[:machine].id
             env[:ui].info(I18n.t('vagrant_openstack.waiting_start'))
             client = env[:openstack_client].nova
-            timeout(@timeout) do
+            timeout(@timeout, Errors::Timeout) do
               while client.get_server_details(env, env[:machine].id)['status'] != 'ACTIVE'
                 sleep @retry_interval
                 @logger.info('Waiting for server to be active')

data/lib/vagrant-openstack-provider/action/wait_stop.rb

@@ -1,10 +1,12 @@
 require 'log4r'
 require 'timeout'
 
+require 'vagrant-openstack-provider/action/abstract_action'
+
 module VagrantPlugins
   module Openstack
     module Action
-      class WaitForServerToStop
+      class WaitForServerToStop < AbstractAction
         def initialize(app, _env, retry_interval = 3, timeout = 200)
           @app    = app
           @logger = Log4r::Logger.new('vagrant_openstack::action::stop_server')
@@ -12,11 +14,11 @@ module VagrantPlugins
           @timeout = timeout
         end
 
-        def call(env)
+        def execute(env)
           if env[:machine].id
             env[:ui].info(I18n.t('vagrant_openstack.waiting_stop'))
             client = env[:openstack_client].nova
-            timeout(@timeout) do
+            timeout(@timeout, Errors::Timeout) do
               while client.get_server_details(env, env[:machine].id)['status'] != 'SHUTOFF'
                 sleep @retry_interval
                 @logger.info('Waiting for server to stop')

data/lib/vagrant-openstack-provider/catalog/openstack_catalog.rb

@@ -0,0 +1,66 @@
+module VagrantPlugins
+  module Openstack
+    module Catalog
+      class OpenstackCatalog
+        def initialize
+          @logger = Log4r::Logger.new('vagrant_openstack::action::openstack_reader')
+        end
+
+        def read(env, catalog)
+          config = env[:machine].provider_config
+          client = env[:openstack_client]
+          endpoints = client.session.endpoints
+          @logger.info(I18n.t('vagrant_openstack.client.looking_for_available_endpoints'))
+          @logger.info("Selecting endpoints matching region '#{config.region}'") unless config.region.nil?
+
+          catalog.each do |service|
+            se = service['endpoints']
+            if config.region.nil?
+              if se.size > 1
+                env[:ui].warn I18n.t('vagrant_openstack.client.multiple_endpoint', size: se.size, type: service['type'])
+                env[:ui].warn "  => #{service['endpoints'][0]['publicURL']}"
+              end
+              url = se[0]['publicURL'].strip
+            else
+              se.each do |endpoint|
+                url = endpoint['publicURL'].strip if endpoint['region'].eql? config.region
+              end
+            end
+            endpoints[service['type'].to_sym] = url unless url.nil? || url.empty?
+          end
+
+          endpoints[:network] = choose_api_version('Neutron', 'openstack_network_url', 'v2') do
+            client.neutron.get_api_version_list(:network)
+          end if config.openstack_network_url.nil? && !endpoints[:network].nil?
+
+          endpoints[:image] = choose_api_version('Glance', 'openstack_image_url', nil, false) do
+            client.glance.get_api_version_list(:image)
+          end if config.openstack_image_url.nil? && !endpoints[:image].nil?
+        end
+
+        private
+
+        def choose_api_version(service_name, url_property, version_prefix = nil, fail_if_not_found = true)
+          versions = yield
+
+          return versions.first['links'].first['href'] if version_prefix.nil?
+
+          if versions.size == 1
+            return versions.first['links'].first['href'] if versions.first['id'].start_with?(version_prefix)
+            fail Errors::NoMatchingApiVersion, api_name: service_name, url_property: url_property, version_list: version_list if fail_if_not_found
+          end
+
+          version_list = ''
+          versions.each do |version|
+            return version['links'].first['href'] if version['id'].start_with?(version_prefix)
+            links = version['links'].map { |l| l['href'] }
+            version_list << "#{version['id'].ljust(6)} #{version['status'].ljust(10)} #{links}\n"
+          end
+
+          fail Errors::NoMatchingApiVersion, api_name: service_name, url_property: url_property, version_list: version_list if fail_if_not_found
+          nil
+        end
+      end
+    end
+  end
+end