diff options
| author |   Steve Baker <sbaker@redhat.com> | 2017-03-01 03:09:31 +0000 |
|---|---|---|
| committer | Steve Baker <sbaker@redhat.com> | 2017-03-01 21:37:54 +0000 |
| commit | 610850140d605b18f4a28099f160fff1e489443d (patch) | |
| tree | e306e29a9f8e5909f987dd00ec525dc92ead6322 /docker/services/ironic-conductor.yaml | |
| parent | ebee7ecfa70b5defe897995c72effa60538ccffc (diff) | |
Put docker puppet config in puppet_config dict
This approach removes the need for the yaql zip to build the
docker-puppet data by building the data in a puppet_config dict.
This allows a future change to make docker-puppet.py only accept dict
data.
Currently the step_config is left where it is and referenced inside
puppet_config, but feedback is welcome whether this is necessary or
desirable.
Change-Id: I4a4d7a6fd2735cb841174af305dbb62e0b3d3e8c
Diffstat (limited to 'docker/services/ironic-conductor.yaml')
| -rw-r--r-- | docker/services/ironic-conductor.yaml | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/docker/services/ironic-conductor.yaml b/docker/services/ironic-conductor.yaml index 945ef3fc..2cc29054 100644 --- a/docker/services/ironic-conductor.yaml +++ b/docker/services/ironic-conductor.yaml @@ -55,19 +55,22 @@ outputs: - ironic::pxe::tftp_root: /var/lib/ironic/tftpboot - ironic::pxe::http_root: /var/lib/ironic/httpboot - ironic::conductor::http_root: /var/lib/ironic/httpboot - step_config: {get_attr: [IronicConductorBase, role_data, step_config]} + step_config: &step_config + get_attr: [IronicConductorBase, role_data, step_config] service_config_settings: {get_attr: [IronicConductorBase, role_data, service_config_settings]} # BEGIN DOCKER SETTINGS docker_image: &ironic_image list_join: - '/' - [ {get_param: DockerNamespace}, {get_param: DockerIronicConductorImage} ] - puppet_tags: ironic_config - config_volume: ironic - config_image: - list_join: - - '/' - - [ {get_param: DockerNamespace}, {get_param: DockerIronicConfigImage} ] + puppet_config: + config_volume: ironic + puppet_tags: ironic_config + step_config: *step_config + config_image: + list_join: + - '/' + - [ {get_param: DockerNamespace}, {get_param: DockerIronicConfigImage} ] kolla_config: /var/lib/kolla/config_files/ironic_conductor.json: command: /usr/bin/ironic-conductor |