Commit ccc09c01 authored by jenspinney's avatar jenspinney

Fix documentation for openstack_provider and provider config options.

parent 9cd66fee
...@@ -38,11 +38,6 @@ each category, the available configuration keys are alphabetized. ...@@ -38,11 +38,6 @@ each category, the available configuration keys are alphabetized.
If not specified, Packer will use the environment variables If not specified, Packer will use the environment variables
`SDK_PASSWORD` or `OS_PASSWORD` (in that order), if set. `SDK_PASSWORD` or `OS_PASSWORD` (in that order), if set.
* `provider` (string) - The provider used to connect to the OpenStack service.
If not specified, Packer will use the environment variable
`SDK_PROVIDER`, if set.
For Rackspace this should be `rackspace-us` or `rackspace-uk`.
* `source_image` (string) - The ID or full URL to the base image to use. * `source_image` (string) - The ID or full URL to the base image to use.
This is the image that will be used to launch a new server and provision it. This is the image that will be used to launch a new server and provision it.
...@@ -70,18 +65,19 @@ each category, the available configuration keys are alphabetized. ...@@ -70,18 +65,19 @@ each category, the available configuration keys are alphabetized.
* `networks` (array of strings) - A list of networks by UUID to attach * `networks` (array of strings) - A list of networks by UUID to attach
to this instance. to this instance.
* `openstack_provider` (string) * `openstack_provider` (string) - A name of a provider that has a slightly
different API model. Currently supported values are "openstack" (default),
and "rackspace".
* `project` (string) - The project name to boot the instance into. Some * `project` (string) - The project name to boot the instance into. Some
OpenStack installations require this. OpenStack installations require this.
If not specified, Packer will use the environment variables If not specified, Packer will use the environment variables
`SDK_PROJECT` or `OS_TENANT_NAME` (in that order), if set. `SDK_PROJECT` or `OS_TENANT_NAME` (in that order), if set.
* `provider` (string) - A name of a provider that has a slightly * `provider` (string) - The provider used to connect to the OpenStack service.
different API model. Currently supported values are "openstack" (default), If not specified, Packer will use the environment variables `SDK_PROVIDER`
and "rackspace". or `OS_AUTH_URL` (in that order), if set.
If not specified, Packer will use the environment variables For Rackspace this should be `rackspace-us` or `rackspace-uk`.
`SDK_PROVIDER` or `OS_AUTH_URL` (in that order), if set.
* `proxy_url` (string) * `proxy_url` (string)
...@@ -124,7 +120,6 @@ Ubuntu 12.04 LTS (Precise Pangolin) on Rackspace OpenStack cloud offering. ...@@ -124,7 +120,6 @@ Ubuntu 12.04 LTS (Precise Pangolin) on Rackspace OpenStack cloud offering.
"api_key": "", "api_key": "",
"openstack_provider": "rackspace", "openstack_provider": "rackspace",
"provider": "rackspace-us", "provider": "rackspace-us",
"openstack_provider":"rackspace",
"region": "DFW", "region": "DFW",
"ssh_username": "root", "ssh_username": "root",
"image_name": "Test image", "image_name": "Test image",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment