Merge "Add support for node groups in NetConfigDataLookup"

[apex-tripleo-heat-templates.git] / docker / services / README.rst

diff --git a/docker/services/README.rst b/docker/services/README.rst
index edaa5ee..881a2a3 100644 (file)
--- a/docker/services/README.rst
+++ b/docker/services/README.rst
@@ -19,8 +19,11 @@ Building Kolla Images
 
 TripleO currently relies on Kolla docker containers. Kolla supports container
 customization and we are making use of this feature within TripleO to inject
 
 TripleO currently relies on Kolla docker containers. Kolla supports container
 customization and we are making use of this feature within TripleO to inject

-puppet (our configuration tool of choice) into the Kolla base images. To
-build Kolla images for TripleO adjust your kolla config to build your
+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

 centos base image with puppet using the example below:
 
 .. code-block::
 centos base image with puppet using the example below:
 
 .. code-block::


@@ -28,6 +31,7 @@ centos base image with puppet using the example below:
 $ cat template-overrides.j2
 {% extends parent_template %}
 {% set base_centos_binary_packages_append = ['puppet'] %}
 $ cat template-overrides.j2
 {% extends parent_template %}
 {% set base_centos_binary_packages_append = ['puppet'] %}

+{% set nova_scheduler_packages_append = ['openstack-tripleo-common'] %}

 
 kolla-build --base centos --template-override template-overrides.j2
 
 
 kolla-build --base centos --template-override template-overrides.j2
 


@@ -76,6 +80,13 @@ are re-asserted when applying latter ones.
    'docker_image' above but some containers share a common set of
    config files which are generated in a common base container.
 
    'docker_image' above but some containers share a common set of
    config files which are generated in a common base container.
 

+ * docker_puppet_tasks: This section provides data to drive the
+   docker-puppet.py tool directly. The task is executed only once
+   within the cluster (not on each node) and is useful for several
+   puppet snippets we require for initialization of things like
+   keystone endpoints, database users, etc. See docker-puppet.py
+   for formatting.
+

 Docker steps
 ------------
 Similar to baremetal docker containers are brought up in a stepwise manner.
 Docker steps
 ------------
 Similar to baremetal docker containers are brought up in a stepwise manner.