Merge pull request #10 from bernard357/development/v1.0

fix option for attributes of the driver

Author: tintoy

README.md

@@ -8,15 +8,15 @@ You will need:
 
 * A network domain
 * A VLAN in that network domain (servers will be attached to this VLAN)
-* If using public IP addresses, a firewall rule that permits SSH traffic from your (local) public IPv4 address to the VLAN's IPv4 network  
+* If using public IP addresses, a firewall rule that permits SSH traffic from your (local) public IPv4 address to the VLAN's IPv4 network
 Alternatively, you can use the `--ddcloud-create-ssh-firewall-rule` flag when creating your machine if you have permissions in CloudControl to create firewall and NAT rules
 * If using private IP addresses, you will need to be connected to the CloudControl VPN for the target data centre
 
 ### Example
 
 ```bash
 docker-machine create --driver ddcloud \
-	--ddcloud-mcp-region AU \
+	--ddcloud-region AU \
 	--ddcloud-datacenter AU9 \
 	--ddcloud-networkdomain 'my-docker-domain' \
 	--ddcloud-vlan 'my-docker-vlan' \
@@ -31,35 +31,31 @@ If you're running on Windows, just remove the backslashes so the whole command i
 
 The driver supports all Docker Machine commands, and can be configured using the following command-line arguments (or environment variables):
 
-* `ddcloud-mcp-user` - The user name used to authenticate to the CloudControl API.  
+* `ddcloud-user` - The user name used to authenticate to the CloudControl API.
 Environment: `MCP_USER`
-* `ddcloud-mcp-password` - The password used to authenticate to the CloudControl API.  
+* `ddcloud-password` - The password used to authenticate to the CloudControl API.
 Environment: `MCP_PASSWORD`.
-* `ddcloud-mcp-region` - The CloudControl region name (e.g. AU, NA, EU, etc).  
-Either `ddcloud-mcp-region` or `ddcloud-mcp-endpoint` must be specified.  
+* `ddcloud-region` - The CloudControl region name (e.g. AU, NA, EU, etc).
 Environment: `MCP_REGION`.
-* `ddcloud-mcp-endpoint` - A custom end-point URI for the CloudControl API.  
-Either `ddcloud-mcp-endpoint` or `ddcloud-mcp-region` must be specified.  
-Environment: `MCP_ENDPOINT`.
 * `ddcloud-networkdomain` - The name of the target CloudControl network domain.
 * `ddcloud-datacenter` - The name of the CloudControl datacenter (e.g. NA1, AU9) in which the network domain is located.
 * `ddcloud-vlan` - The name of the target CloudControl VLAN.
-* `ddcloud-image-name` - The name of the OS image used to create the target machine.  
-Note that only OS images are supported for now, not customer images.  
+* `ddcloud-image-name` - The name of the OS image used to create the target machine.
+Note that only OS images are supported for now, not customer images.
 Additionally, the OS must be a Linux distribution supported by docker-machine (Ubuntu 12.04 and above are supported, but RedHat 6 and 7 are not supported due to iptables configuration issues).
-* `ddcloud-ssh-user` - The SSH username to use.  
-Default: "root".  
+* `ddcloud-ssh-user` - The SSH username to use.
+Default: "root".
 Environment: `MCP_SSH_USER`.
-* `ddcloud-ssh-key` - The SSH key file to use.  
+* `ddcloud-ssh-key` - The SSH key file to use.
 Environment: `MCP_SSH_KEY`.
-* `ddcloud-ssh-port` - The SSH port to use.  
-Default: 22.  
+* `ddcloud-ssh-port` - The SSH port to use.
+Default: 22.
 Environment: `MCP_SSH_PORT`.
-* `ddcloud-ssh-bootstrap-password` - The initial SSH password used to bootstrap SSH key authentication.  
-This password is removed once the SSH key has been installed  
+* `ddcloud-ssh-bootstrap-password` - The initial SSH password used to bootstrap SSH key authentication.
+This password is removed once the SSH key has been installed
 Environment: `MCP_SSH_BOOTSTRAP_PASSWORD`
 * `ddcloud-create-ssh-firewall-rule` - Automatically create a firewall rule to enable inbound SSH to the target server?
-* `ddcloud-client-public-ip` - Use the specified IPv4 address as the client's public IP address (don't auto-detect).  
+* `ddcloud-client-public-ip` - Use the specified IPv4 address as the client's public IP address (don't auto-detect).
 Environment: `MCP_CLIENT_PUBLIC_IP`.
 * `ddcloud-use-private-ip` - Don't create NAT and firewall rules for target server (you will need to be connected to the VPN for your target data centre).