Fixed all volume references; fixes #961

Signed-off-by: Matt Bentley <matt.bentley@docker.com>
This commit is contained in:
Matt Bentley 2016-03-11 07:16:12 -05:00 committed by Joao Fernandes
parent 4b098304f4
commit 09db8b95ba
3 changed files with 11 additions and 11 deletions

View File

@ -229,15 +229,15 @@ You can also send the `--san` option to specify the SANs for a host.
UCP uses named volumes for persistence of data. When installing UCP for
production, you need to create the following volumes:
| Volume name | Data |
|:---------------------------|:---------------------------------------------------------------------------------------------------------------|
| ucp-root-ca | The certificate and key for the UCP root CA. Do not create this volume if you are using your own certificates. |
| ucp-swarm-root-ca | The certificate and key for the Swarm root CA. |
| ucp-server-certs | The controller certificates for the UCP controllers web server. |
| ucp-swarm-node-certs | The Swarm certificates for the current node (repeated on every node in the cluster). |
| ucp-swarm-kv-certs | The Swarm KV client certificates for the current node (repeated on every node in the cluster). |
| ucp-swarm-controller-certs | The UCP Controller Swarm client certificates for the current node. |
| ucp-kv | Key value store persistence. |
| Volume name | Data |
|:----------------------------|:---------------------------------------------------------------------------------------------------------------|
| ucp-client-root-ca | The certificate and key for the UCP root CA. Do not create this volume if you are using your own certificates. |
| ucp-cluster-root-ca | The certificate and key for the Swarm root CA. |
| ucp-controller-server-certs | The controller certificates for the UCP controllers web server. |
| ucp-node-certs | The Swarm certificates for the current node (repeated on every node in the cluster). |
| ucp-kv-certs | The Swarm KV client certificates for the current node (repeated on every node in the cluster). |
| ucp-controller-client-certs | The UCP Controller Swarm client certificates for the current node. |
| ucp-kv | Key value store persistence. |
If you don't create these volumes, the `ucp install` command creates them for
you with the default volume driver and flags.

View File

@ -151,7 +151,7 @@ To install UCP with your own external root CA:
1. Log into the machine where you intend to install UCP.
2. Make sure you have created a named volume called `ucp-server-certs`.
2. Make sure you have created a named volume called `ucp-controller-server-certs`.
3. Add the following files to the volume's top-level directory:

View File

@ -33,7 +33,7 @@ ports:
You can optionally use an externally generated and signed certificate for the
UCP controller by using the `--external-ucp-ca`. Create a storage volume named
`ucp-server-certs` with ca.pem, cert.pem, and key.pem in the root directory
`ucp-controller-server-certs` with ca.pem, cert.pem, and key.pem in the root directory
before running the install.
A license file can optionally be added during install by volume