Skip to content

Commit

Permalink
Update README
Browse files Browse the repository at this point in the history
  • Loading branch information
julienvey authored and ggiamarchi committed Jan 30, 2015
1 parent 670e815 commit 524024f
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions README.md
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 524024f

Please sign in to comment.