summaryrefslogtreecommitdiffstats
path: root/docker/services
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-24 23:04:25 +0000
committerGerrit Code Review <review@openstack.org>2017-03-24 23:04:25 +0000
commit02841754dc8003534e75748a588d944c4d17c226 (patch)
treec7b432fc959165b762b5cb639fc9e6980e6b3b25 /docker/services
parent8716d9f769dd17ef17fef7f0fdefaf0df6a7fe24 (diff)
parent3de4324d76456307ee41385d34d46c5078c70cd5 (diff)
Merge "Clarify Kolla build overrides for tripleo"
Diffstat (limited to 'docker/services')
-rw-r--r--docker/services/README.rst6
1 files changed, 5 insertions, 1 deletions
diff --git a/docker/services/README.rst b/docker/services/README.rst
index 219f35eb..465e4abe 100644
--- a/docker/services/README.rst
+++ b/docker/services/README.rst
@@ -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
---------------