From 096b42abce08a94f1e802ae19ea901a31312917a Mon Sep 17 00:00:00 2001 From: Jose Cardoso Date: Tue, 26 Jan 2016 09:41:30 +0000 Subject: [PATCH 1/3] Added support for spaces in vSphere resource pools --- post-processor/vsphere/post-processor.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/post-processor/vsphere/post-processor.go b/post-processor/vsphere/post-processor.go index 2bbaa3933..2689ffffc 100644 --- a/post-processor/vsphere/post-processor.go +++ b/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)) From a1c4c6aacecdfad17dfa77ea2188f4cfb27c7d6b Mon Sep 17 00:00:00 2001 From: Tyler Tidman Date: Tue, 26 Jan 2016 09:28:24 -0500 Subject: [PATCH 2/3] Rename communicator markdown file to match the rest of the website source files --- .../{communicator.html.md => communicator.html.markdown} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename website/source/docs/templates/{communicator.html.md => communicator.html.markdown} (100%) diff --git a/website/source/docs/templates/communicator.html.md b/website/source/docs/templates/communicator.html.markdown similarity index 100% rename from website/source/docs/templates/communicator.html.md rename to website/source/docs/templates/communicator.html.markdown From c6a21ab491bdaff856850e148a039a962c231c8e Mon Sep 17 00:00:00 2001 From: Einar Forselv Date: Wed, 27 Jan 2016 01:30:17 +0100 Subject: [PATCH 3/3] Openstack builder documentation needs v3 auth information Added some basic information about v3 authentication. --- .../docs/builders/openstack.html.markdown | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/website/source/docs/builders/openstack.html.markdown b/website/source/docs/builders/openstack.html.markdown index cb54b52d2..272a2f538 100644 --- a/website/source/docs/builders/openstack.html.markdown +++ b/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"