Merge lp:~gz/juju-core/update_config_openstack_1.18 into lp:juju-core/docs

[Martin Packman]

Updates configuration guidelines for openstack to use the same text as found in juju-core 1.18 provider/openstack/provider.go `juju init` generation.

This includes some nicer formatting, and a couple of new fields, notably 'networks' for bug 1241674 and 'use-default-secgroup' for bug 1129720. Other providers also probably want updating.

[Nick Veitch (evilnick)]

Hi!
Sorry, I didn't make it clear we do this on github now - https://github.com/juju/docs

It's okay though, I am merging your changes there.
FYI - we don't use 'juju init' in docs anymore!

=== modified file 'htmldocs/config-openstack.html'
--- htmldocs/config-openstack.html	2013-12-16 14:54:13 +0000
+++ htmldocs/config-openstack.html	2014-04-10 13:22:24 +0000
@@ -80,28 +80,79 @@
             <p>The essential configuration sections for OpenStack look like this:</p>
             <pre class="prettyprint lang-yaml">
 openstack:
-  type: openstack
-  # Specifies whether the use of a floating IP address is required to give the nodes
-  # a public IP address. Some installations assign public IP addresses by default without
-  # requiring a floating IP address.
-  # use-floating-ip: false
-  admin-secret: 13850d1b9786065cadd0f477e8c97cd3
-  # Globally unique swift bucket name
-  control-bucket: juju-fd6ab8d02393af742bfbe8b9629707ee
-  # Usually set via the env variable OS_AUTH_URL, but can be specified here
-  # auth-url: https://yourkeystoneurl:443/v2.0/
-  # override if your workstation is running a different series to which you are deploying
-  # default-series: precise
-  # The following are used for userpass authentication (the default)
-  auth-mode: userpass
-  # Usually set via the env variable OS_USERNAME, but can be specified here
-  # username: <your username>
-  # Usually set via the env variable OS_PASSWORD, but can be specified here
-  # password: <secret>
-  # Usually set via the env variable OS_TENANT_NAME, but can be specified here
-  # tenant-name: <your tenant name>
-  # Usually set via the env variable OS_REGION_NAME, but can be specified here
-  # region: <your region></pre>
+    type: openstack
+
+    # use-floating-ip specifies whether a floating IP address is
+    # required to give the nodes a public IP address. Some
+    # installations assign public IP addresses by default without
+    # requiring a floating IP address.
+    #
+    # use-floating-ip: false
+
+    # use-default-secgroup specifies whether new machine instances
+    # should have the "default" Openstack security group assigned.
+    #
+    # use-default-secgroup: false
+
+    # network specifies the network label or uuid to bring machines up
+    # on, in the case where multiple networks exist. It may be omitted
+    # otherwise.
+    #
+    # network: &lt;your network label or uuid>
+
+    # tools-metadata-url specifies the location of the Juju tools and
+    # metadata. It defaults to the global public tools metadata
+    # location https://streams.canonical.com/tools.
+    #
+    # tools-metadata-url:  https://your-tools-metadata-url
+
+    # image-metadata-url specifies the location of Ubuntu cloud image
+    # metadata. It defaults to the global public image metadata
+    # location https://cloud-images.ubuntu.com/releases.
+    #
+    # image-metadata-url:  https://your-image-metadata-url
+
+    # image-stream chooses a simplestreams stream to select OS images
+    # from, for example daily or released images (or any other stream
+    # available on simplestreams).
+    #
+    # image-stream: "released"
+
+    # auth-url defaults to the value of the environment variable
+    # OS_AUTH_URL, but can be specified here.
+    #
+    # auth-url: https://yourkeystoneurl:443/v2.0/
+
+    # tenant-name holds the openstack tenant name. It defaults to the
+    # environment variable OS_TENANT_NAME.
+    #
+    # tenant-name: &lt;your tenant name>
+
+    # region holds the openstack region. It defaults to the
+    # environment variable OS_REGION_NAME.
+    #
+    # region: &lt;your region>
+
+    # The auth-mode, username and password attributes are used for
+    # userpass authentication (the default).
+    #
+    # auth-mode holds the authentication mode. For user-password
+    # authentication, auth-mode should be "userpass" and username and
+    # password should be set appropriately; they default to the
+    # environment variables OS_USERNAME and OS_PASSWORD respectively.
+    #
+    # auth-mode: userpass
+    # username: &lt;your username>
+    # password: &lt;secret>
+
+    # For key-pair authentication, auth-mode should be "keypair" and
+    # access-key and secret-key should be set appropriately; they
+    # default to the environment variables OS_ACCESS_KEY and
+    # OS_SECRET_KEY respectively.
+    #
+    # auth-mode: keypair
+    # access-key: &lt;secret>
+    # secret-key: &lt;secret></pre>
 
             <p class="note"><strong>Note:</strong> At any time you can run <code>juju init --show</code> to display the most revent version of the environments.yaml template file, instead of having it write to file.</p>
             <p>Remember to substitute in the parts of the snippet that are important to you. If you are deploying on OpenStack the following documentation might also be useful:</p>
@@ -204,4 +255,4 @@
 
 
 
-</body></html>
\ No newline at end of file
+</body></html>