Swift JSON files looking for rings in the wrong place

For Swift, the *.json.j2 templates are looking under
{{ container_config_directory }} whereas they need to be looking in the
common location for swift which is /var/lib/kolla/swift

Change-Id: I6f0dcbc9a705b36d1d98275ba9ebc56404fe882d
backport: liberty
Closes-Bug: #1504210

14 files changed, 23 insertions, 23 deletions

diff --git a/ansible/roles/swift/templates/swift-account-auditor.json.j2 b/ansible/roles/swift/templates/swift-account-auditor.json.j2
index 8553ad029..c5bd96776 100644
--- a/ansible/roles/swift/templates/swift-account-auditor.json.j2
+++ b/ansible/roles/swift/templates/swift-account-auditor.json.j2
@@ -8,7 +8,7 @@
             "perm": "0640"
         },
         {
-            "source": "{{ container_config_directory }}/account.ring.gz",
+            "source": "/var/lib/kolla/swift/account.ring.gz",
             "dest": "/etc/swift/account.ring.gz",
             "owner": "swift",
             "perm": "0640"
diff --git a/ansible/roles/swift/templates/swift-account-reaper.json.j2 b/ansible/roles/swift/templates/swift-account-reaper.json.j2
index 086b39e29..2e7408496 100644
--- a/ansible/roles/swift/templates/swift-account-reaper.json.j2
+++ b/ansible/roles/swift/templates/swift-account-reaper.json.j2
@@ -8,7 +8,7 @@
             "perm": "0640"
         },
         {
-            "source": "{{ container_config_directory }}/account.ring.gz",
+            "source": "/var/lib/kolla/swift/account.ring.gz",
             "dest": "/etc/swift/account.ring.gz",
             "owner": "swift",
             "perm": "0640"
diff --git a/ansible/roles/swift/templates/swift-account-replicator.json.j2 b/ansible/roles/swift/templates/swift-account-replicator.json.j2
index 1dc49b855..ca1abbf12 100644
--- a/ansible/roles/swift/templates/swift-account-replicator.json.j2
+++ b/ansible/roles/swift/templates/swift-account-replicator.json.j2
@@ -8,7 +8,7 @@
             "perm": "0640"
         },
         {
-            "source": "{{ container_config_directory }}/account.ring.gz",
+            "source": "/var/lib/kolla/swift/account.ring.gz",
             "dest": "/etc/swift/account.ring.gz",
             "owner": "swift",
             "perm": "0640"
diff --git a/ansible/roles/swift/templates/swift-account-server.json.j2 b/ansible/roles/swift/templates/swift-account-server.json.j2
index 43b562114..140cded88 100644
--- a/ansible/roles/swift/templates/swift-account-server.json.j2
+++ b/ansible/roles/swift/templates/swift-account-server.json.j2
@@ -8,7 +8,7 @@
             "perm": "0640"
         },
         {
-            "source": "{{ container_config_directory }}/account.ring.gz",
+            "source": "/var/lib/kolla/swift/account.ring.gz",
             "dest": "/etc/swift/account.ring.gz",
             "owner": "swift",
             "perm": "0640"
diff --git a/ansible/roles/swift/templates/swift-container-auditor.json.j2 b/ansible/roles/swift/templates/swift-container-auditor.json.j2
index d517d6a4b..d3e4fbe07 100644
--- a/ansible/roles/swift/templates/swift-container-auditor.json.j2
+++ b/ansible/roles/swift/templates/swift-container-auditor.json.j2
@@ -8,7 +8,7 @@
             "perm": "0640"
         },
         {
-            "source": "{{ container_config_directory }}/container.ring.gz",
+            "source": "/var/lib/kolla/swift/container.ring.gz",
             "dest": "/etc/swift/container.ring.gz",
             "owner": "swift",
             "perm": "0640"
diff --git a/ansible/roles/swift/templates/swift-container-replicator.json.j2 b/ansible/roles/swift/templates/swift-container-replicator.json.j2
index 36ecf9a09..9a61642a0 100644
--- a/ansible/roles/swift/templates/swift-container-replicator.json.j2
+++ b/ansible/roles/swift/templates/swift-container-replicator.json.j2
@@ -8,7 +8,7 @@
             "perm": "0640"
         },
         {
-            "source": "{{ container_config_directory }}/container.ring.gz",
+            "source": "/var/lib/kolla/swift/container.ring.gz",
             "dest": "/etc/swift/container.ring.gz",
             "owner": "swift",
             "perm": "0640"
diff --git a/ansible/roles/swift/templates/swift-container-server.json.j2 b/ansible/roles/swift/templates/swift-container-server.json.j2
index a181b9c71..87e6cbc22 100644
--- a/ansible/roles/swift/templates/swift-container-server.json.j2
+++ b/ansible/roles/swift/templates/swift-container-server.json.j2
@@ -8,7 +8,7 @@
             "perm": "0640"
         },
         {
-            "source": "{{ container_config_directory }}/container.ring.gz",
+            "source": "/var/lib/kolla/swift/container.ring.gz",
             "dest": "/etc/swift/container.ring.gz",
             "owner": "swift",
             "perm": "0640"
diff --git a/ansible/roles/swift/templates/swift-container-updater.json.j2 b/ansible/roles/swift/templates/swift-container-updater.json.j2
index edf32abfa..9feb3ac1f 100644
--- a/ansible/roles/swift/templates/swift-container-updater.json.j2
+++ b/ansible/roles/swift/templates/swift-container-updater.json.j2
@@ -8,13 +8,13 @@
             "perm": "0640"
         },
         {
-            "source": "{{ container_config_directory }}/account.ring.gz",
+            "source": "/var/lib/kolla/swift/account.ring.gz",
             "dest": "/etc/swift/account.ring.gz",
             "owner": "swift",
             "perm": "0640"
         },
         {
-            "source": "{{ container_config_directory }}/container.ring.gz",
+            "source": "/var/lib/kolla/swift/container.ring.gz",
             "dest": "/etc/swift/container.ring.gz",
             "owner": "swift",
             "perm": "0640"
diff --git a/ansible/roles/swift/templates/swift-object-auditor.json.j2 b/ansible/roles/swift/templates/swift-object-auditor.json.j2
index 4f52de141..a5058282e 100644
--- a/ansible/roles/swift/templates/swift-object-auditor.json.j2
+++ b/ansible/roles/swift/templates/swift-object-auditor.json.j2
@@ -8,13 +8,13 @@
             "perm": "0640"
         },
         {
-            "source": "{{ container_config_directory }}/container.ring.gz",
+            "source": "/var/lib/kolla/swift/container.ring.gz",
             "dest": "/etc/swift/container.ring.gz",
             "owner": "swift",
             "perm": "0640"
         },
         {
-            "source": "{{ container_config_directory }}/object.ring.gz",
+            "source": "/var/lib/kolla/swift/object.ring.gz",
             "dest": "/etc/swift/object.ring.gz",
             "owner": "swift",
             "perm": "0640"
diff --git a/ansible/roles/swift/templates/swift-object-expirer.json.j2 b/ansible/roles/swift/templates/swift-object-expirer.json.j2
index 09fcbdc71..301fdcf7c 100644
--- a/ansible/roles/swift/templates/swift-object-expirer.json.j2
+++ b/ansible/roles/swift/templates/swift-object-expirer.json.j2
@@ -8,19 +8,19 @@
             "perm": "0640"
         },
         {
-            "source": "{{ container_config_directory }}/account.ring.gz",
+            "source": "/var/lib/kolla/swift/account.ring.gz",
             "dest": "/etc/swift/account.ring.gz",
             "owner": "swift",
             "perm": "0640"
         },
         {
-            "source": "{{ container_config_directory }}/container.ring.gz",
+            "source": "/var/lib/kolla/swift/container.ring.gz",
             "dest": "/etc/swift/container.ring.gz",
             "owner": "swift",
             "perm": "0640"
         },
         {
-            "source": "{{ container_config_directory }}/object.ring.gz",
+            "source": "/var/lib/kolla/swift/object.ring.gz",
             "dest": "/etc/swift/object.ring.gz",
             "owner": "swift",
             "perm": "0640"
diff --git a/ansible/roles/swift/templates/swift-object-replicator.json.j2 b/ansible/roles/swift/templates/swift-object-replicator.json.j2
index db73d50e7..2b9f04582 100644
--- a/ansible/roles/swift/templates/swift-object-replicator.json.j2
+++ b/ansible/roles/swift/templates/swift-object-replicator.json.j2
@@ -8,13 +8,13 @@
             "perm": "0640"
         },
         {
-            "source": "{{ container_config_directory }}/container.ring.gz",
+            "source": "/var/lib/kolla/swift/container.ring.gz",
             "dest": "/etc/swift/container.ring.gz",
             "owner": "swift",
             "perm": "0640"
         },
         {
-            "source": "{{ container_config_directory }}/object.ring.gz",
+            "source": "/var/lib/kolla/swift/object.ring.gz",
             "dest": "/etc/swift/object.ring.gz",
             "owner": "swift",
             "perm": "0640"
diff --git a/ansible/roles/swift/templates/swift-object-server.json.j2 b/ansible/roles/swift/templates/swift-object-server.json.j2
index cb988beb0..4d1df326f 100644
--- a/ansible/roles/swift/templates/swift-object-server.json.j2
+++ b/ansible/roles/swift/templates/swift-object-server.json.j2
@@ -8,13 +8,13 @@
             "perm": "0640"
         },
         {
-            "source": "{{ container_config_directory }}/container.ring.gz",
+            "source": "/var/lib/kolla/swift/container.ring.gz",
             "dest": "/etc/swift/container.ring.gz",
             "owner": "swift",
             "perm": "0640"
         },
         {
-            "source": "{{ container_config_directory }}/object.ring.gz",
+            "source": "/var/lib/kolla/swift/object.ring.gz",
             "dest": "/etc/swift/object.ring.gz",
             "owner": "swift",
             "perm": "0640"
diff --git a/ansible/roles/swift/templates/swift-object-updater.json.j2 b/ansible/roles/swift/templates/swift-object-updater.json.j2
index aa2c88e7d..1410f4c4b 100644
--- a/ansible/roles/swift/templates/swift-object-updater.json.j2
+++ b/ansible/roles/swift/templates/swift-object-updater.json.j2
@@ -8,13 +8,13 @@
             "perm": "0640"
         },
         {
-            "source": "{{ container_config_directory }}/container.ring.gz",
+            "source": "/var/lib/kolla/swift/container.ring.gz",
             "dest": "/etc/swift/container.ring.gz",
             "owner": "swift",
             "perm": "0640"
         },
         {
-            "source": "{{ container_config_directory }}/object.ring.gz",
+            "source": "/var/lib/kolla/swift/object.ring.gz",
             "dest": "/etc/swift/object.ring.gz",
             "owner": "swift",
             "perm": "0640"
diff --git a/ansible/roles/swift/templates/swift-proxy-server.json.j2 b/ansible/roles/swift/templates/swift-proxy-server.json.j2
index 00bf937d9..52328b724 100644
--- a/ansible/roles/swift/templates/swift-proxy-server.json.j2
+++ b/ansible/roles/swift/templates/swift-proxy-server.json.j2
@@ -8,19 +8,19 @@
             "perm": "0640"
         },
         {
-            "source": "{{ container_config_directory }}/account.ring.gz",
+            "source": "/var/lib/kolla/swift/account.ring.gz",
             "dest": "/etc/swift/account.ring.gz",
             "owner": "swift",
             "perm": "0640"
         },
         {
-            "source": "{{ container_config_directory }}/container.ring.gz",
+            "source": "/var/lib/kolla/swift/container.ring.gz",
             "dest": "/etc/swift/container.ring.gz",
             "owner": "swift",
             "perm": "0640"
         },
         {
-            "source": "{{ container_config_directory }}/object.ring.gz",
+            "source": "/var/lib/kolla/swift/object.ring.gz",
             "dest": "/etc/swift/object.ring.gz",
             "owner": "swift",
             "perm": "0640"