Merge "Disable xinetd class when creating swift-storage puppet configuration" into...

diff --git a/docker/services/swift-storage.yaml b/docker/services/swift-storage.yaml
index e0c1194..2d7aff6 100644 (file)
--- 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: