Gotea/docker-machine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1642 from ddaze/openstack-retry

Browse Source 
openstack: New machine active timeout parameter
This commit is contained in:
Nathan LeClaire
2015-09-11 14:25:11 -07:00
parent 5ba35ac2de 66b4e3b826
commit 7c4d0a5da7
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/drivers/openstack.md
View File

@@ -36,6 +36,7 @@ Options:
there is no IP address already allocated a new IP will be allocated and assigned to the machine.
- `--openstack-ssh-user`: The username to use for SSH into the machine. If not provided `root` will be used.
- `--openstack-ssh-port`: Customize the SSH port if the SSH server on the machine does not listen on the default port.
- `--openstack-active-timeout`: The timeout in seconds until the OpenStack instance must be active.
Environment variables and default values:
@@ -62,3 +63,4 @@ Environment variables and default values:
| `--openstack-floatingip-pool` | - | - |
| `--openstack-ssh-user` | - | `root` |
| `--openstack-ssh-port` | - | `22` |
| `--openstack-active-timeout` | - | `200` |