diff options
Diffstat (limited to 'doc/quickstart.rst')
| -rw-r--r-- | doc/quickstart.rst | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/doc/quickstart.rst b/doc/quickstart.rst index ebfbeca44..7ee7016a7 100644 --- a/doc/quickstart.rst +++ b/doc/quickstart.rst @@ -141,9 +141,9 @@ following command: curl -sSL https://get.docker.io | bash This command will install the most recent stable version of Docker, but please -note that Kolla releases are not in sync with docker in any way, so some things +note that Kolla releases are not in sync with Docker in any way, so some things could stop working with new version. The latest release of Kolla is tested to -work with docker-engine >= 1.10.0. To check your docker version run this +work with docker-engine >= 1.10.0. To check your Docker version run this command: :: @@ -155,7 +155,7 @@ in the Docker daemon to launch with. This means setting up the following information in the ``docker.service`` file. If you do not set the MountFlags option correctly then ``kolla-ansible`` will fail to deploy the ``neutron-dhcp-agent`` container and throws APIError/HTTPError. After adding -the drop-in unit file as follows, reload and restart the docker service: +the drop-in unit file as follows, reload and restart the Docker service: :: @@ -168,7 +168,7 @@ the drop-in unit file as follows, reload and restart the docker service: MountFlags=shared EOF -Restart docker by executing the following commands: +Restart Docker by executing the following commands: :: @@ -413,7 +413,7 @@ Kolla, but if running from master, it is recommended to build images locally. Checkout the :doc:`image-building` for more advanced build configuration. -Before running the below instructions, ensure the docker daemon is running +Before running the below instructions, ensure the Docker daemon is running or the build process will fail. To build images using default parameters run: :: @@ -520,7 +520,7 @@ For *all-in-one* deploys, the following commands can be run. These will setup all of the containers on the localhost. These commands will be wrapped in the kolla-script in the future. -.. note:: Even for all-in-one installs it is possible to use the docker +.. note:: Even for all-in-one installs it is possible to use the Docker registry for deployment, although not strictly required. First, check that the deployment targets are in a state where Kolla may deploy @@ -647,7 +647,7 @@ Any time the tags of a release change, it is possible that the container implementation from older versions won't match the Ansible playbooks in a new version. If running multinode from a registry, each node's Docker image cache must be refreshed with the latest images before a new deployment can occur. To -refresh the docker cache from the local Docker registry: +refresh the Docker cache from the local Docker registry: :: |