diff options
| author |   Zuul <zuul@review.openstack.org> | 2017-10-23 10:29:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-10-23 10:29:58 +0000 |
| commit | 30bf7b3ab907c8dddc35d2f9b1640c653acb71c9 (patch) | |
| tree | 1ebda01f1f0063aaa6b48ee4c5e6912d810da385 /docker | |
| parent | bbf25a19c808d2f6b0a5e1c4809c17d0c87fd827 (diff) | |
| parent | d8c7fc05305fc52b0042d52990f16124a04756a5 (diff) | |
Merge "Disable xinetd class when creating swift-storage puppet configuration" into stable/pike
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/services/swift-storage.yaml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/docker/services/swift-storage.yaml b/docker/services/swift-storage.yaml index e0c1194a..2d7aff6e 100644 --- a/docker/services/swift-storage.yaml +++ b/docker/services/swift-storage.yaml @@ -83,7 +83,10 @@ outputs: logging_source: {get_attr: [SwiftStorageBase, role_data, logging_source]} logging_groups: {get_attr: [SwiftStorageBase, role_data, logging_groups]} step_config: &step_config - get_attr: [SwiftStorageBase, role_data, step_config] + list_join: + - "\n" + - - {get_attr: [SwiftStorageBase, role_data, step_config]} + - "class xinetd() {}" service_config_settings: {get_attr: [SwiftStorageBase, role_data, service_config_settings]} # BEGIN DOCKER SETTINGS puppet_config: |