From 0e88d4b24f0a3c8348a9d1334f3f15d179392176 Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Fri, 16 Nov 2018 13:38:41 -0700
Subject: [PATCH] Noop out xinetd::service

With puppet 5.5.6, the xinetd::service being included by rsync::server
is force including the init.pp from xinetd. Since we don't actually want
any xinetd configurations in the container bits, we also need to noop
out xinetd::service along with the xinetd class.

Change-Id: I3075a852290d873915a61aae5fbe96202efb400f
Related-Blueprint: puppet5-support
---
 docker/services/swift-storage.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker/services/swift-storage.yaml b/docker/services/swift-storage.yaml
index 73fcccc77e..2c3d6fc742 100644
--- a/docker/services/swift-storage.yaml
+++ b/docker/services/swift-storage.yaml
@@ -99,6 +99,7 @@ outputs:
           list_join:
             - "\n"
             - - "class xinetd() {}"
+              - "define xinetd::service($bind='',$port='',$server='',$server_args='') {}"
               - {get_attr: [SwiftStorageBase, role_data, step_config]}
         config_image: {get_param: DockerSwiftConfigImage}
       kolla_config: