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/swift-ringbuilder.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/swift-ringbuilder.yaml')
| -rw-r--r-- | docker/services/swift-ringbuilder.yaml | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/docker/services/swift-ringbuilder.yaml b/docker/services/swift-ringbuilder.yaml index de91e7cf..027a6956 100644 --- a/docker/services/swift-ringbuilder.yaml +++ b/docker/services/swift-ringbuilder.yaml @@ -66,15 +66,18 @@ outputs: value: service_name: {get_attr: [SwiftRingbuilderBase, role_data, service_name]} config_settings: {get_attr: [SwiftRingbuilderBase, role_data, config_settings]} - step_config: {get_attr: [SwiftRingbuilderBase, role_data, step_config]} + step_config: &step_config + get_attr: [SwiftRingbuilderBase, role_data, step_config] service_config_settings: {get_attr: [SwiftRingbuilderBase, role_data, service_config_settings]} - puppet_tags: exec,ring_object_device,swift::ringbuilder::create,tripleo::profile::base::swift::add_devices,swift::ringbuilder::rebalance # BEGIN DOCKER SETTINGS docker_image: &docker_image list_join: - '/' - [ {get_param: DockerNamespace}, {get_param: DockerSwiftProxyImage} ] - config_volume: 'swift' - config_image: *docker_image + puppet_config: + config_volume: 'swift' + puppet_tags: exec,ring_object_device,swift::ringbuilder::create,tripleo::profile::base::swift::add_devices,swift::ringbuilder::rebalance + step_config: *step_config + config_image: *docker_image kolla_config: {} docker_config: {} |