vagrant-openstack-provider 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06f76da66e9d69d7b3750c87355a2b0cd494d82e
-  data.tar.gz: 94b6f3cfae8334fecf64e9fc69d1e8e2da651659
+  metadata.gz: 6fcb72c6f544989dbe6afa13b2320eb81f35505e
+  data.tar.gz: 5f04da4d1e21da40d5d7ad6bb83e471e654292f6
 SHA512:
-  metadata.gz: afa0415d10ee018a52bb356c3bb3a387ae9035c84d44696d16f38f87e854cc72a85ed73c002203775f83b5fb7ed5814fc25406ac854e98dbb66f7062509b218f
-  data.tar.gz: 33d2530168597883a587064f92571ca8a8291efe617b1f38d4ba154eafa90d7b16b7ff08b4d27adf820755b155f2718a8699a7db417d5ad3f70df6d3a3b15aaa
+  metadata.gz: b4427ad7ce03abf95ebbc7f1dabc6188d66cb5daf5a8c5b07f9ff21c6bc44b8fdb62767ff4549bdb99c26bca4b775aad0d648d7df13865420e2ec440217705b9
+  data.tar.gz: 98450beaed75447f516f1be64dd46b399d6aa4e856d999a01f213fe7a0594693fe74d6108034efd1f200d191e0d597e637c7147a057752304a0295e48bc0d28e

data/CHANGELOG.md

@@ -1,3 +1,35 @@
+# 0.6.0 (November 28, 2014)
+
+FEATURES:
+
+  - First implementation of Heat Stacks [#170](https://github.com/ggiamarchi/vagrant-openstack-provider/pull/170)
+  - Allow public and private networks to be specified [#148](https://github.com/ggiamarchi/vagrant-openstack-provider/pull/148)
+  - Add custom command "subnet-list" [#160](https://github.com/ggiamarchi/vagrant-openstack-provider/pull/160)
+  - Allow public and private networks to be specified [#148](https://github.com/ggiamarchi/vagrant-openstack-provider/pull/148)
+  - Add config parameter os.region [#128](https://github.com/ggiamarchi/vagrant-openstack-provider/pull/128)
+
+IMPROVEMENTS:
+
+  - Rsync all files [#166](https://github.com/ggiamarchi/vagrant-openstack-provider/pull/166)
+  - Support glance API v1 [#168](https://github.com/ggiamarchi/vagrant-openstack-provider/pull/168)
+  - Replace fail <string> by fail Errors::... [#152](https://github.com/ggiamarchi/vagrant-openstack-provider/pull/152)
+  - When an unknown error occurs, provide information to debug and submit issue [#115](https://github.com/ggiamarchi/vagrant-openstack-provider/pull/115)
+  - Print more information for command "vagrant openstack image-list" [#104](https://github.com/ggiamarchi/vagrant-openstack-provider/pull/104)
+  - Cannot 'resume' while instance is in vm_state active [#91](https://github.com/ggiamarchi/vagrant-openstack-provider/pull/91)
+  - Allow config.floating_ip_pool to take an array as input [#90](https://github.com/ggiamarchi/vagrant-openstack-provider/pull/90)
+  - Display the current task value in the status option [#89](https://github.com/ggiamarchi/vagrant-openstack-provider/pull/89)
+
+BUG FIXES:
+
+  - Fix ssh_disabled [#182](https://github.com/ggiamarchi/vagrant-openstack-provider/pull/182)
+  - Avoid printing contribution message on user interruption [#169](https://github.com/ggiamarchi/vagrant-openstack-provider/pull/169)
+  - Network configuration is lost when machine definition overrides provider's configuration [#146](https://github.com/ggiamarchi/vagrant-openstack-provider/pull/146)
+  - When VM status is "ERROR" continue waiting for startup [#62](https://github.com/ggiamarchi/vagrant-openstack-provider/pull/62)
+
+DOCUMENTATION:
+
+  - Add a CONTRIBUTING.md file [#151](https://github.com/ggiamarchi/vagrant-openstack-provider/pull/151)
+
 # 0.5.2 (November 6, 2014)
 
 BUG FIXES:
@@ -32,6 +64,8 @@ BUG FIXES:
   - user_data needs to be Base64 encoded in Nova.createServer [#122](https://github.com/ggiamarchi/vagrant-openstack-provider/issues/122)
   - SSH failures after port 22 is open because user doesn't exist yet [#106](https://github.com/ggiamarchi/vagrant-openstack-provider/issues/106)
   - Floating IP should not be mandatory [#55](https://github.com/ggiamarchi/vagrant-openstack-provider/issues/55)
+  - sync_folders error under windows 7 [#119](https://github.com/ggiamarchi/vagrant-openstack-provider/issues/119)
+  - Ansible provisionner doesn't use our generated SSH key [#133](https://github.com/ggiamarchi/vagrant-openstack-provider/issues/133)
 
 # 0.4.1 (October 3, 2014)
 

data/lib/vagrant-openstack-provider.rb

@@ -1,6 +1,7 @@
 require 'pathname'
 
 require 'vagrant-openstack-provider/plugin'
+require 'vagrant-openstack-provider/logging'
 
 module VagrantPlugins
   module Openstack
@@ -14,38 +15,8 @@ module VagrantPlugins
       I18n.reload!
     end
 
-    # This initializes the logging so that our logs are outputted at
-    # the same level as Vagrant core logs.
     def self.init_logging
-      # Initialize logging
-      level = nil
-      begin
-        level = Log4r.const_get(ENV['VAGRANT_LOG'].upcase)
-      rescue NameError
-        # This means that the logging constant wasn't found,
-        # which is fine. We just keep `level` as `nil`. But
-        # we tell the user.
-        begin
-          level = Log4r.const_get(ENV['VAGRANT_OPENSTACK_LOG'].upcase)
-        rescue NameError
-          level = nil
-        end
-      end
-
-      # Some constants, such as "true" resolve to booleans, so the
-      # above error checking doesn't catch it. This will check to make
-      # sure that the log level is an integer, as Log4r requires.
-      level = nil unless level.is_a?(Integer)
-
-      # Set the logging level
-      # logs as long as we have a valid level.
-      if level
-        logger = Log4r::Logger.new('vagrant_openstack')
-        out = Log4r::Outputter.stdout
-        out.formatter = Log4r::PatternFormatter.new(pattern: '%d | %5l | %m', date_pattern: '%Y-%m-%d %H:%M')
-        logger.outputters = out
-        logger.level = level
-      end
+      Logging.init
     end
 
     # This returns the path to the source of this plugin.

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

@@ -18,6 +18,7 @@ module VagrantPlugins
               b2.use Message, I18n.t('vagrant_openstack.not_created')
             else
               b2.use DeleteServer
+              b2.use DeleteStack
             end
           end
         end
@@ -97,10 +98,13 @@ module VagrantPlugins
           b.use Call, ReadState do |env, b2|
             case env[:machine_state_id]
             when :not_created
-              b2.use Provision
+              ssh_disabled = env[:machine].provider_config.ssh_disabled
+              b2.use Provision unless ssh_disabled
               b2.use SyncFolders
+              b2.use CreateStack
               b2.use CreateServer
-              b2.use WaitForServerToBeAccessible
+              b2.use Message, I18n.t('vagrant_openstack.ssh_disabled_provisioning') if ssh_disabled
+              b2.use WaitForServerToBeAccessible unless ssh_disabled
             when :shutoff
               b2.use StartServer
             when :suspended
@@ -128,17 +132,21 @@ module VagrantPlugins
 
       # This is the action that is primarily responsible for suspending
       # the virtual machine.
+      # Vm cannot be suspended when the machine_state_id is not "active" (typically a task is ongoing)
       def self.action_suspend
         new_builder.tap do |b|
           b.use ConfigValidate
           b.use ConnectOpenstack
           b.use Call, ReadState do |env, b2|
-            if env[:machine_state_id] == :not_created
+            case env[:machine_state_id]
+            when :not_created
               b2.use Message, I18n.t('vagrant_openstack.not_created')
-            elsif env[:machine_state_id] == :suspended
+            when :suspended
               b2.use Message, I18n.t('vagrant_openstack.already_suspended')
-            else
+            when :active
               b2.use Suspend
+            else
+              b2.use Message, I18n.t('vagrant_openstack.ongoing_task')
             end
           end
         end
@@ -146,15 +154,19 @@ module VagrantPlugins
 
       # This is the action that is primarily responsible for resuming
       # suspended machines.
+      # Vm cannot be resumed when the machine_state_id is not suspended.
       def self.action_resume
         new_builder.tap do |b|
           b.use ConfigValidate
           b.use ConnectOpenstack
           b.use Call, ReadState do |env, b2|
-            if env[:machine_state_id] == :not_created
+            case env[:machine_state_id]
+            when :not_created
               b2.use Message, I18n.t('vagrant_openstack.not_created')
-            else
+            when :suspended
               b2.use Resume
+            else
+              b2.use Message, I18n.t('vagrant_openstack.not_suspended')
             end
           end
         end
@@ -190,6 +202,8 @@ module VagrantPlugins
       autoload :Message, action_root.join('message')
       autoload :ConnectOpenstack, action_root.join('connect_openstack')
       autoload :CreateServer, action_root.join('create_server')
+      autoload :CreateStack, action_root.join('create_stack')
+      autoload :DeleteStack, action_root.join('delete_stack')
       autoload :DeleteServer, action_root.join('delete_server')
       autoload :StopServer, action_root.join('stop_server')
       autoload :StartServer, action_root.join('start_server')

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

@@ -0,0 +1,22 @@
+require 'colorize'
+
+module VagrantPlugins
+  module Openstack
+    module Action
+      class AbstractAction
+        def call(env)
+          execute(env)
+        # rubocop:disable Style/SpecialGlobalVars
+        # rubocop:disable Lint/RescueException
+        rescue Errors::VagrantOpenstackError, SystemExit, Interrupt => e
+          raise e
+        rescue Exception => e
+          puts I18n.t('vagrant_openstack.global_error').red unless e.message && e.message.start_with?('Catched Error:')
+          raise $!, "Catched Error: #{$!}", $!.backtrace
+        end
+        # rubocop:enable Lint/RescueException
+        # rubocop:enable Style/SpecialGlobalVars
+      end
+    end
+  end
+end

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

@@ -4,25 +4,30 @@ require 'json'
 
 require 'vagrant-openstack-provider/client/openstack'
 require 'vagrant-openstack-provider/client/request_logger'
+require 'vagrant-openstack-provider/action/abstract_action'
+require 'vagrant-openstack-provider/catalog/openstack_catalog'
 
 module VagrantPlugins
   module Openstack
     module Action
-      class ConnectOpenstack
+      class ConnectOpenstack < AbstractAction
         include VagrantPlugins::Openstack::HttpUtils::RequestLogger
+        include VagrantPlugins::Openstack::Catalog
 
-        def initialize(app, env)
+        def initialize(app, env, catalog_reader = OpenstackCatalog.new)
           @app = app
           @logger = Log4r::Logger.new('vagrant_openstack::action::connect_openstack')
+          @catalog_reader = catalog_reader
           env[:openstack_client] = VagrantPlugins::Openstack
         end
 
-        def call(env)
+        def execute(env)
           client = env[:openstack_client]
           if client.session.token.nil?
             catalog = client.keystone.authenticate(env)
-            read_endpoint_catalog(env, catalog)
+            @catalog_reader.read(env, catalog)
             override_endpoint_catalog_with_user_config(env)
+            check_configuration(env)
             log_endpoint_catalog(env)
           end
           @app.call(env) unless @app.nil?
@@ -30,45 +35,19 @@ module VagrantPlugins
 
         private
 
-        def read_endpoint_catalog(env, catalog)
-          config = env[:machine].provider_config
-          client = env[:openstack_client]
-          @logger.info(I18n.t('vagrant_openstack.client.looking_for_available_endpoints'))
-
-          catalog.each do |service|
-            se = service['endpoints']
-            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
-            client.session.endpoints[service['type'].to_sym] = url unless url.empty?
-          end
-
-          read_network_api_version(env) if config.openstack_network_url.nil? && !client.session.endpoints[:network].nil?
-        end
-
-        def read_network_api_version(env)
-          client = env[:openstack_client]
-          versions = client.neutron.get_api_version_list(env)
-          if versions.size > 1
-            version_list = ''
-            versions.each do |version|
-              links = version['links'].map { |l| l['href'] }
-              version_list << "#{version['id'].ljust(6)} #{version['status'].ljust(10)} #{links}\n"
-            end
-            fail Errors::MultipleApiVersion, api_name: 'Neutron', url_property: 'openstack_network_url', version_list: version_list
-          end
-          client.session.endpoints[:network] = versions.first['links'].first['href']
-        end
-
         def override_endpoint_catalog_with_user_config(env)
           client = env[:openstack_client]
           config = env[:machine].provider_config
-          client.session.endpoints[:compute] = config.openstack_compute_url unless config.openstack_compute_url.nil?
-          client.session.endpoints[:network] = config.openstack_network_url unless config.openstack_network_url.nil?
-          client.session.endpoints[:volume]  = config.openstack_volume_url  unless config.openstack_volume_url.nil?
-          client.session.endpoints.delete_if { |_, value| value.nil? || value.empty? }
+          endpoints = client.session.endpoints
+          endpoints[:compute] = config.openstack_compute_url unless config.openstack_compute_url.nil?
+          endpoints[:network] = config.openstack_network_url unless config.openstack_network_url.nil?
+          endpoints[:volume]  = config.openstack_volume_url  unless config.openstack_volume_url.nil?
+          endpoints[:image]   = config.openstack_image_url   unless config.openstack_image_url.nil?
+          endpoints.delete_if { |_, value| value.nil? || value.empty? }
+        end
+
+        def check_configuration(env)
+          fail Errors::MissingNovaEndpoint unless env[:openstack_client].session.endpoints.key? :compute
         end
 
         def log_endpoint_catalog(env)

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

@@ -5,12 +5,13 @@ require 'sshkey'
 
 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 CreateServer
+      class CreateServer < AbstractAction
         include Vagrant::Util::Retryable
 
         def initialize(app, _env, resolver = ConfigResolver.new, utils = Utils.new)
@@ -20,7 +21,7 @@ module VagrantPlugins
           @utils = utils
         end
 
-        def call(env)
+        def execute(env)
           @logger.info 'Start create server action'
 
           config = env[:machine].provider_config
@@ -127,12 +128,15 @@ module VagrantPlugins
         end
 
         def waiting_for_server_to_be_built(env, server_id, retry_interval = 3, timeout = 200)
-          @logger.info 'Waiting for the server to be built...'
+          @logger.info "Waiting for the server with id #{server_id} to be built..."
           env[:ui].info(I18n.t('vagrant_openstack.waiting_for_build'))
-          timeout(timeout) do
-            while env[:openstack_client].nova.get_server_details(env, server_id)['status'] != 'ACTIVE'
-              sleep retry_interval
+          timeout(timeout, Errors::Timeout) do
+            server_status = 'WAITING'
+            until server_status == 'ACTIVE'
               @logger.debug('Waiting for server to be ACTIVE')
+              server_status = env[:openstack_client].nova.get_server_details(env, server_id)['status']
+              fail Errors::ServerStatusError, server: server_id if server_status == 'ERROR'
+              sleep retry_interval
             end
           end
         end

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

@@ -0,0 +1,67 @@
+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 CreateStack < AbstractAction
+        def initialize(app, _env)
+          @app = app
+          @logger = Log4r::Logger.new('vagrant_openstack::action::create_stack')
+        end
+
+        def execute(env)
+          @logger.info 'Start create stacks action'
+
+          config = env[:machine].provider_config
+
+          heat = env[:openstack_client].heat
+
+          config.stacks.each do |stack|
+            env[:ui].info(I18n.t('vagrant_openstack.create_stack'))
+            env[:ui].info(" -- Stack Name : #{stack[:name]}")
+            env[:ui].info(" -- Template   : #{stack[:template]}")
+
+            create_opts = {
+              name: stack[:name],
+              template: YAML.load_file(stack[:template])
+            }
+
+            stack_id = heat.create_stack(env, create_opts)
+
+            file_path = "#{env[:machine].data_dir}/stack_#{stack[:name]}_id"
+            File.write(file_path, stack_id)
+
+            waiting_for_stack_to_be_created(env, stack[:name], stack_id)
+          end unless config.stacks.nil?
+
+          @app.call(env)
+        end
+
+        private
+
+        def waiting_for_stack_to_be_created(env, stack_name, stack_id, retry_interval = 3, timeout = 200)
+          @logger.info "Waiting for the stack with id #{stack_id} to be built..."
+          env[:ui].info(I18n.t('vagrant_openstack.waiting_for_stack'))
+          timeout(timeout, Errors::Timeout) do
+            stack_status = 'CREATE_IN_PROGRESS'
+            until stack_status == 'CREATE_COMPLETE'
+              @logger.debug('Waiting for stack to be CREATED')
+              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 == 'CREATE_FAILED'
+              sleep retry_interval
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,26 +1,51 @@
 require 'log4r'
 
+require 'vagrant-openstack-provider/action/abstract_action'
+
 module VagrantPlugins
   module Openstack
     module Action
       # This deletes the running server, if there is one.
-      class DeleteServer
+      class DeleteServer < AbstractAction
         def initialize(app, _env)
           @app    = app
           @logger = Log4r::Logger.new('vagrant_openstack::action::delete_server')
         end
 
-        def call(env)
+        def execute(env)
           if env[:machine].id
             @logger.info "Deleting server #{env[:machine].id}..."
             env[:ui].info(I18n.t('vagrant_openstack.deleting_server'))
             env[:openstack_client].nova.delete_server(env, env[:machine].id)
             env[:openstack_client].nova.delete_keypair_if_vagrant(env, env[:machine].id)
-            env[:machine].id = nil
+
+            waiting_for_instance_to_be_deleted(env, env[:machine].id)
+
           end
 
           @app.call(env)
         end
+
+        private
+
+        def waiting_for_instance_to_be_deleted(env, instance_id, retry_interval = 3, timeout = 200)
+          @logger.info "Waiting for the instance with id #{instance_id} to be deleted..."
+          env[:ui].info(I18n.t('vagrant_openstack.waiting_deleted'))
+          timeout(timeout, Errors::Timeout) do
+            delete_ok = false
+            until delete_ok
+              begin
+                @logger.debug('Waiting for instance to be DELETED')
+                server_status = env[:openstack_client].nova.get_server_details(env, instance_id)['status']
+                fail Errors::ServerStatusError, server: instance_id if server_status == 'ERROR'
+                break if server_status == 'DELETED'
+                sleep retry_interval
+              rescue Errors::InstanceNotFound
+                delete_ok = true
+              end
+            end
+          end
+        end
       end
     end
   end