diff --git a/README.md b/README.md index fe6b784..1e84dc3 100644 --- a/README.md +++ b/README.md @@ -110,10 +110,6 @@ This provider exposes quite a few provider-specific configuration options: * `user_data` - String of User data to be sent to the newly created OpenStack instance. Use this e.g. to inject a script at boot time. * `metadata` - A Hash of metadata that will be sent to the instance for configuration e.g. `os.metadata = { 'key' => 'value' }` * `scheduler_hints` - Pass hints to the OpenStack scheduler, e.g. { "cell": "some cell name" } -* `server_create_timeout` - Time to wait in seconds for the server to be created when `vagrant up`. Default is `200` -* `server_active_timeout` - Time to wait in seconds for the server to become active when `vagrant up` or `vagrant resume`. Default is `200` -* `server_stop_timeout` - Time to wait in seconds for the server to stop when `vagrant halt`. Default is `200` -* `server_delete_timeout` - Time to wait in seconds for the server to be deleted when `vagrant destroy`. Default is `200` #### Floating IPs @@ -270,6 +266,16 @@ the remote machine over SSH. This is good enough for all built-in Vagrant provisioners (shell, chef, and puppet) to work! +### Timeouts + +* `server_create_timeout` - Time to wait in seconds for the server to be created when `vagrant up`. Default is `200` +* `server_active_timeout` - Time to wait in seconds for the server to become active when `vagrant up` or `vagrant resume`. Default is `200` +* `server_stop_timeout` - Time to wait in seconds for the server to stop when `vagrant halt`. Default is `200` +* `server_delete_timeout` - Time to wait in seconds for the server to be deleted when `vagrant destroy`. Default is `200` +* `http.open_timeout` - Open timeout for any HTTP request. Default is `60` +* `http.read_timeout` - Read timeout for any HTTP request. Default is `30` + + ## Vagrant standard configuration There are some standard configuration options that this provider takes into account when