path: root/docker/services/README.rst
diff options
authorDan Prince <dprince@redhat.com>2017-01-03 21:57:14 -0500
committerDan Prince <dprince@redhat.com>2017-01-29 08:16:19 -0500
commit9d82796da2ae30be4eb3dfcc9612c6947f882ded (patch)
treed0de8079e27bed985f210cf794686f746cb9be97 /docker/services/README.rst
parent8a646686edb6822214abd9b91e4b593bcd616e46 (diff)
docker: eliminate copy-json.py in favor of json-file
This patch rewires how we configure the Kolla external config files via Heat templates and uses a more simple json-file heat hook to directly write out Kolla config files to disk. By using a heat hook instead of a shell script we can avoid Json conversion issues. Additionally, This generic json file hook will be useful for other ad-hoc Json file configuration within the TripleO docker architecture. Co-Authored-By: Martin André <m.andre@redhat.com> Change-Id: I8c72a4a9a7022f722bfe1cef3e18517605720cce Depends-On: I2b372ac2e291339e436202c9fe58a681ed6a743f Depends-On: Id3f779b11e23fd3122ef29b7ccbae116667d4520
Diffstat (limited to 'docker/services/README.rst')
1 files changed, 5 insertions, 0 deletions
diff --git a/docker/services/README.rst b/docker/services/README.rst
index 8d1f9e86..60719bfc 100644
--- a/docker/services/README.rst
+++ b/docker/services/README.rst
@@ -32,6 +32,11 @@ are re-asserted when applying latter ones.
* config_settings: Custom hiera settings for this service. These are
used to generate configs.
+ * kolla_config: Contains YAML that represents how to map config files
+ into the kolla container. This config file is typically mapped into
+ the container itself at the /var/lib/kolla/config_files/config.json
+ location and drives how kolla's external config mechanisms work.
* step_config: A puppet manifest that is used to step through the deployment
sequence. Each sequence is given a "step" (via hiera('step') that provides
information for when puppet classes should activate themselves.