From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 30 Jun 2017 04:12:32 +0000 (+0000)
Subject: Merge "Add missing xinetd/rsync container for Swift"
X-Git-Tag: opnfv-6.0.0~458
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=a396ac325af8950acb18227f1a6a487159776020;p=apex-tripleo-heat-templates.git

Merge "Add missing xinetd/rsync container for Swift"
---

a396ac325af8950acb18227f1a6a487159776020
diff --cc docker/services/swift-storage.yaml
index 011e6d42,50753e43..f2b8c474
--- a/docker/services/swift-storage.yaml
+++ b/docker/services/swift-storage.yaml
@@@ -86,12 -73,12 +86,12 @@@ outputs
        # BEGIN DOCKER SETTINGS
        puppet_config:
          config_volume: swift
-         puppet_tags: swift_config,swift_container_config,swift_container_sync_realms_config,swift_account_config,swift_object_config,swift_object_expirer_config
+         puppet_tags: swift_config,swift_container_config,swift_container_sync_realms_config,swift_account_config,swift_object_config,swift_object_expirer_config,rsync::server
          step_config: *step_config
 -        config_image: &swift_proxy_image
 +        config_image:
            list_join:
              - '/'
 -            - [ {get_param: DockerNamespace}, {get_param: DockerSwiftProxyImage} ]
 +            - [ {get_param: DockerNamespace}, {get_param: DockerSwiftConfigImage} ]
        kolla_config:
          /var/lib/kolla/config_files/swift_account_auditor.json:
            command: /usr/bin/swift-account-auditor /etc/swift/account-server.conf