openstack
/
tripleo-docs
Code Issues Proposed changes

Fix references to files in tripleo-common/contrib 

contrib will be deleted soon, and the container-images files are
packaged now. This change fixes references to these files in the
container building documentation.

Change-Id: Ia6069b68678ae332be7fe58244b9dbbb7d2e1bc3
This commit is contained in:
Steve Baker 2017-04-21 09:56:30 +12:00
parent b61a2f8720
commit 9a68cc906e
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/source/containers_deployment/architecture.rst
View File

@ -43,13 +43,15 @@ of the services, like mariadb::
Use the following command to build an image using kolla-build and the template
above (`template-overrides.j2`)::
$ kolla-build --base centos --template-override template-overrides.j2
$ kolla-build --base centos \
--template-override /usr/share/tripleo-common/container-images/tripleo_kolla_template_overrides.j2 \
--template-override template-overrides.j2
TripleO maintains its complete list of kolla customization in the
`tripleo-common`_ project.
.. _Kolla: https://docs.openstack.org/developer/kolla/image-building.html#dockerfile-customisation
.. _tripleo-common: https://github.com/openstack/tripleo-common/blob/master/contrib/tripleo_kolla_template_overrides.j2
.. _tripleo-common: https://github.com/openstack/tripleo-common/blob/master/container-images/tripleo_kolla_template_overrides.j2
heat-config-docker-cmd
----------------------

2
doc/source/containers_deployment/overcloud.rst
View File

@ -55,7 +55,7 @@ dockerhub, use the following command::
Or use `kolla-build` to build the images yourself::
kolla-build --base centos --type binary --namespace tripleoupstream --registry 192.168.24.1:8787 --tag latest --template-override /usr/share/tripleo-common/contrib/tripleo_kolla_template_overrides.j2 --push
kolla-build --base centos --type binary --namespace tripleoupstream --registry 192.168.24.1:8787 --tag latest --template-override /usr/share/tripleo-common/container-images/tripleo_kolla_template_overrides.j2 --push
Finally, point the heat templates to your local registry, for example in
a `$HOME/docker_registry.yaml` file::

4
doc/source/containers_deployment/tips_tricks.rst
View File

@ -164,11 +164,9 @@ Testing in CI
-------------
When new service containers are added, ensure to update the image names in
`contrib/overcloud_containers.yaml` tripleo-common repo. These service
`container-images/overcloud_containers.yaml` tripleo-common repo. These service
images are pulled in and available in the local docker registry that the
containers ci job uses::
uploads:
- imagename: tripleoupstream/centos-binary-example:latest
uploader: docker
pull_source: docker.io