lib/vagrant-conoha/config.rb in vagrant-conoha-0.1.5 vs lib/vagrant-conoha/config.rb in vagrant-conoha-0.1.6

@@ -76,13 +76,14 @@
       # the `config.ssh.username` variable.
       #
       # @return [String]
       attr_accessor :ssh_username
 
-      # The SSH timeout use after server creation. If server startup is too long
-      # the timeout value can be increase with this variable. Default is 60 seconds
+      # The SSH timeout use after server creation.
       #
+      # Deprecated. Use config.vm.boot_timeout instead.
+      #
       # @return [Integer]
       attr_accessor :ssh_timeout
 
       # Opt files/directories in to the rsync operation performed by this provider
       #
@@ -197,10 +198,14 @@
 
       #
       # @return [HttpConfig]
       attr_accessor :http
 
+      #
+      # @return [Boolean]
+      attr_accessor :meta_args_support
+
       def initialize
         @password = UNSET_VALUE
         @openstack_compute_url = UNSET_VALUE
         @openstack_network_url = UNSET_VALUE
         @openstack_volume_url = UNSET_VALUE
@@ -239,10 +244,11 @@
         @server_active_timeout = UNSET_VALUE
         @server_stop_timeout = UNSET_VALUE
         @server_delete_timeout = UNSET_VALUE
         @stack_create_timeout = UNSET_VALUE
         @stack_delete_timeout = UNSET_VALUE
+        @meta_args_support = UNSET_VALUE
         @http = HttpConfig.new
       end
 
       def merge(other)
         result = self.class.new
@@ -314,18 +320,20 @@
         @user_data = nil if @user_data == UNSET_VALUE
         @metadata = nil if @metadata == UNSET_VALUE
         @ssh_disabled = false if @ssh_disabled == UNSET_VALUE
 
         # The SSH values by default are nil, and the top-level config
-        # `config.ssh` values are used.
+        # `config.ssh` and `config.vm.boot_timeout` values are used.
         @ssh_username = nil if @ssh_username == UNSET_VALUE
-        @ssh_timeout = 180 if @ssh_timeout == UNSET_VALUE
+        @ssh_timeout = nil if @ssh_timeout == UNSET_VALUE
+
         @server_create_timeout = 200 if @server_create_timeout == UNSET_VALUE
         @server_active_timeout = 200 if @server_active_timeout == UNSET_VALUE
         @server_stop_timeout = 200 if @server_stop_timeout == UNSET_VALUE
         @server_delete_timeout = 200 if @server_delete_timeout == UNSET_VALUE
         @stack_create_timeout = 200 if @stack_create_timeout == UNSET_VALUE
         @stack_delete_timeout = 200 if @stack_delete_timeout == UNSET_VALUE
+        @meta_args_support = false if @meta_args_support == UNSET_VALUE
         @networks = nil if @networks.empty?
         @volumes = nil if @volumes.empty?
         @stacks = nil if @stacks.empty?
         @http.finalize!
       end