From 41921cfa768f80ba6a187fca02a63b44e34f656f Mon Sep 17 00:00:00 2001
From: Christian Schwede <cschwede@redhat.com>
Date: Thu, 16 Nov 2017 11:17:04 +0100
Subject: [PATCH] Add swift_config puppet tag to the dockerized proxy service

This ensures that the base class is applied, setting the required hash
values in swift.conf properly when deploying a proxy node without the
storage service at the same time.

Closes-Bug: 1732663
Depends-On: I11c044bbc8b9f56f95ace9320cc77303d9a7543e
Change-Id: Id916413c9d74071968d9988b604664fad30282b2
---
 docker/services/swift-proxy.yaml                           | 2 +-
 .../swift-proxy-use-hash-suffix-a0641435337a4b05.yaml      | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/swift-proxy-use-hash-suffix-a0641435337a4b05.yaml

diff --git a/docker/services/swift-proxy.yaml b/docker/services/swift-proxy.yaml
index 4647f73be5..b3feadc8f5 100644
--- a/docker/services/swift-proxy.yaml
+++ b/docker/services/swift-proxy.yaml
@@ -75,7 +75,7 @@ outputs:
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: swift
-        puppet_tags: swift_proxy_config
+        puppet_tags: swift_config,swift_proxy_config
         step_config:
           get_attr: [SwiftProxyBase, role_data, step_config]
         config_image: {get_param: DockerSwiftConfigImage}
diff --git a/releasenotes/notes/swift-proxy-use-hash-suffix-a0641435337a4b05.yaml b/releasenotes/notes/swift-proxy-use-hash-suffix-a0641435337a4b05.yaml
new file mode 100644
index 0000000000..4f7d8ca8ce
--- /dev/null
+++ b/releasenotes/notes/swift-proxy-use-hash-suffix-a0641435337a4b05.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Add swift_config puppet tag to the dockerized proxy service to
+    ensure the required hash values in swift.conf are set properly.
+    This is required when deploying a proxy node without the
+    storage service at the same time.