Merge branch 'master' of https://github.com/mitchellh/packer

post-processor/vsphere/post-processor.go

@@ -128,7 +128,7 @@ func (p *PostProcessor) PostProcess(ui packer.Ui, artifact packer.Artifact) (pac
 		fmt.Sprintf("--network=\"%s\"", p.config.VMNetwork),
 		fmt.Sprintf("--vmFolder=\"%s\"", p.config.VMFolder),
 		fmt.Sprintf("%s", source),
-		fmt.Sprintf("%s", ovftool_uri),
+		fmt.Sprintf("\"%s\"", ovftool_uri),
 	}
 
 	ui.Message(fmt.Sprintf("Uploading %s to vSphere", source))

website/source/docs/builders/openstack.html.markdown

@@ -82,6 +82,10 @@ builder.
     instance into. Some OpenStack installations require this. If not specified,
     Packer will use the environment variable `OS_TENANT_NAME`, if set.
 
+-   `domain_name` or `domain_id` (string) - The Domain name or ID you are 
+    authenticating with. OpenStack installations require this if identity v3 is used.
+    Packer will use the environment variable `OS_DOMAIN_NAME` or `OS_DOMAIN_ID`, if set.
+
 -   `security_groups` (array of strings) - A list of security groups by name to
     add to this instance.
 
@@ -148,3 +152,24 @@ environment variables like:
 -   `OS_TENANT_ID`
 -   `OS_USERNAME`
 -   `OS_PASSWORD`
+
+This is slightly different when identity v3 is used:
+
+-   `OS_AUTH_URL`
+-   `OS_USERNAME`
+-   `OS_PASSWORD`
+-   `OS_DOMAIN_NAME`
+-   `OS_TENANT_NAME`
+
+This will authenticate the user on the domain and scope you to the project. 
+A tenant is the same as a project. It's optional to use names or IDs in v3. 
+This means you can use `OS_USERNAME` or `OS_USERID`,  `OS_TENANT_ID` or 
+`OS_TENANT_NAME` and `OS_DOMAIN_ID` or `OS_DOMAIN_NAME`.
+
+The above example would be equivalent to an RC file looking like this :
+
+    export OS_AUTH_URL="https://identity.myprovider/v3"
+    export OS_USERNAME="myuser"
+    export OS_PASSWORD="password"
+    export OS_USER_DOMAIN_NAME="mydomain"
+    export OS_PROJECT_DOMAIN_NAME="mydomain"