openstack/tripleo-docs
Code Issues Proposed changes

Merge "Stop using deprecated options for the prepare cmd"

Browse Source
This commit is contained in:
Zuul 2017-10-31 14:23:13 +00:00 committed by Gerrit Code Review
commit 84a716e299
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/install/containers_deployment/3rd_party.rst
View File

@ -1,6 +1,8 @@
Integrating 3rd Party Containers in TripleO Integrating 3rd Party Containers in TripleO
=========================================== ===========================================
.. _build_container_images:
Building Containers Building Containers
------------------- -------------------

28
doc/source/install/containers_deployment/overcloud.rst
View File

@ -50,13 +50,13 @@ with container images from RDO docker registry::
openstack overcloud container image prepare \ openstack overcloud container image prepare \
--namespace trunk.registry.rdoproject.org/master \ --namespace trunk.registry.rdoproject.org/master \
--tag tripleo-ci-testing \ --tag tripleo-ci-testing \
--env-file ~/docker_registry.yaml --output-env-file ~/docker_registry.yaml
The options ``--namespace master`` and ``--tag tripleo-ci-testing`` The options ``--namespace trunk.registry.rdoproject.org/master`` and ``--tag
will typically be replaced with values specific to the environment. You tripleo-ci-testing`` will typically be replaced with values specific to the
may wish to use ``tripleo-passed-ci`` for a more stable set of containers. environment. You may wish to use ``tripleo-passed-ci`` for a more stable set of
Run with ``--help`` to see the other options available for controlling containers. Run with ``--help`` to see the other options available for
what is generated. controlling what is generated.
For production deployments (or for testing upgrades and rollbacks) stable tags For production deployments (or for testing upgrades and rollbacks) stable tags
like `passed-ci` should never be used, instead explicit versioned tags are like `passed-ci` should never be used, instead explicit versioned tags are
@ -83,21 +83,19 @@ pull and push diestinations::
--namespace trunk.registry.rdoproject.org/master \ --namespace trunk.registry.rdoproject.org/master \
--tag tripleo-ci-testing \ --tag tripleo-ci-testing \
--push-destination 192.168.24.1:8787 \ --push-destination 192.168.24.1:8787 \
--images-file overcloud_containers.yaml --output-images-file overcloud_containers.yaml
It is possible to limit the output to only the images that are going to be used It is possible to limit the output to only the images that are going to be used
in the deployment by specifying the heat environment files with the in the deployment by specifying the heat environment files with the
``--service-environment-file`` option and the roles file with the ``--environment-file`` option and the roles file with the ``--roles-file``
``--roles-file`` option. option.
Then upload the images to the local registry using the generated file:: Then upload the images to the local registry using the generated file::
openstack overcloud container image upload --config-file overcloud_containers.yaml openstack overcloud container image upload --config-file overcloud_containers.yaml
Or use ``kolla-build`` to build and push the images yourself. This is useful Or :ref:`build and push the images <build_container_images>` yourself. This is
if you wish to build a new container or modify an existing one:: useful if you wish to customize the containers or modify an existing one.
kolla-build --base centos --type binary --namespace master --registry 192.168.24.1:8787 --tag latest --template-override /usr/share/tripleo-common/container-images/tripleo_kolla_template_overrides.j2 --push
The command ``openstack overcloud container image prepare`` then needs to be The command ``openstack overcloud container image prepare`` then needs to be
called again to generate the `~/docker_registry.yaml` file that specifies the called again to generate the `~/docker_registry.yaml` file that specifies the
@ -105,8 +103,8 @@ containers available in the local registry::
openstack overcloud container image prepare \ openstack overcloud container image prepare \
--namespace 192.168.24.1:8787/master \ --namespace 192.168.24.1:8787/master \
--tag latest \ --tag tripleo-ci-testing \
--env-file ~/docker_registry.yaml --output-env-file ~/docker_registry.yaml
Deploying the containerized Overcloud Deploying the containerized Overcloud

2
doc/source/install/containers_deployment/undercloud.rst
View File

@ -104,7 +104,7 @@ similar to the containerized overcloud case, see
:ref:`prepare-environment-containers`. The simplified command looks like:: :ref:`prepare-environment-containers`. The simplified command looks like::
$ openstack overcloud container image prepare \ $ openstack overcloud container image prepare \
--env-file $HOME/docker_registry.yaml --output-env-file $HOME/docker_registry.yaml
Deploying the undercloud Deploying the undercloud
~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~