openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Clarify Kolla build overrides for tripleo"

This commit is contained in:
Jenkins 2017-03-24 23:04:25 +00:00 committed by Gerrit Code Review
parent 8716d9f769 3de4324d76
commit 02841754dc
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/services/README.rst
View File

@ -23,7 +23,7 @@ puppet (our configuration tool of choice) into the Kolla base images. The
undercloud nova-scheduler also requires openstack-tripleo-common to
provide custom filters.
To build Kolla images for TripleO adjust your kolla config to build your
To build Kolla images for TripleO adjust your kolla config [*]_ to build your
centos base image with puppet using the example below:
.. code-block::
@ -37,6 +37,10 @@ kolla-build --base centos --template-override template-overrides.j2
..
.. [*] See the
`override file <https://github.com/openstack/tripleo-common/blob/master/contrib/tripleo_kolla_template_overrides.j2>`_
which can be used to build Kolla packages that work with TripleO, and an
`example build script <https://github.com/dprince/undercloud_containers/blob/master/build_kolla.sh>_.
Docker settings
---------------