diff options
author | Dan Prince <dprince@redhat.com> | 2017-01-29 08:01:46 -0500 |
---|---|---|
committer | Dan Prince <dprince@redhat.com> | 2017-02-15 13:09:59 -0500 |
commit | 84626c82cc54a0b1de595cbac06336045947dc4a (patch) | |
tree | a290af3c02f2f14eb451319aace0d5d903df2374 /docker/services | |
parent | ad2ea290bed17bff9b53ac225d3604ed642ee8bc (diff) |
Add docker_puppet_tasks initialization on primary node
This patch adds a new (optional) section to the docker post.j2.yaml
that collects any 'docker_puppet_tasks' data from enabled
services and applies it on the primary role node (the
first node in the primary (first) role).
The use case for this is although we are generally only using
puppet for configuration there are several exceptions that we
desire to make use of today for parity with baremetal. This
includes things like database creation and keystone endpoint
initialization which we rely on configuration via hiera variables
controlled by the puppet services.
Change-Id: Ic14ef48f26de761b0d0eabd0e1c0eae52d90e68a
Diffstat (limited to 'docker/services')
-rw-r--r-- | docker/services/README.rst | 7 | ||||
-rw-r--r-- | docker/services/services.yaml | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/docker/services/README.rst b/docker/services/README.rst index edaa5ee9..c054e8c0 100644 --- a/docker/services/README.rst +++ b/docker/services/README.rst @@ -76,6 +76,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_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. diff --git a/docker/services/services.yaml b/docker/services/services.yaml index 8e899024..cd9f4cb5 100644 --- a/docker/services/services.yaml +++ b/docker/services/services.yaml @@ -75,3 +75,5 @@ outputs: map_merge: {get_attr: [ServiceChain, role_data, kolla_config]} docker_config: {get_attr: [ServiceChain, role_data, docker_config]} + docker_puppet_tasks: + {get_attr: [ServiceChain, role_data, docker_puppet_tasks]} |