Update swift templates to support swift_extra_ring_files

Change-Id: Ie594f6cdbe332d64d3461d84da730111d0db5cf1
Related-Bug: #1844752

ansible/roles/swift/templates/swift-object-auditor.json.j2

@@ -13,6 +13,14 @@
             "owner": "swift",
             "perm": "0640"
         },
+        {% for ring in swift_extra_ring_files %}
+        {
+            "source": "/var/lib/kolla/swift/{{ ring }}",
+            "dest": "/etc/swift/{{ ring }}",
+            "owner": "swift",
+            "perm": "0640"
+        },
+        {% endfor %}
         {
             "source": "{{ container_config_directory }}/swift.conf",
             "dest": "/etc/swift/swift.conf",

ansible/roles/swift/templates/swift-object-expirer.json.j2

@@ -19,6 +19,14 @@
             "owner": "swift",
             "perm": "0640"
         },
+        {% for ring in swift_extra_ring_files %}
+        {
+            "source": "/var/lib/kolla/swift/{{ ring }}",
+            "dest": "/etc/swift/{{ ring }}",
+            "owner": "swift",
+            "perm": "0640"
+        },
+        {% endfor %}
         {
             "source": "{{ container_config_directory }}/swift.conf",
             "dest": "/etc/swift/swift.conf",

ansible/roles/swift/templates/swift-object-replication-server.json.j2

@@ -13,6 +13,14 @@
             "owner": "swift",
             "perm": "0640"
         },
+        {% for ring in swift_extra_ring_files %}
+        {
+            "source": "/var/lib/kolla/swift/{{ ring }}",
+            "dest": "/etc/swift/{{ ring }}",
+            "owner": "swift",
+            "perm": "0640"
+        },
+        {% endfor %}
         {
             "source": "{{ container_config_directory }}/swift.conf",
             "dest": "/etc/swift/swift.conf",

ansible/roles/swift/templates/swift-object-replicator.json.j2

@@ -13,6 +13,14 @@
             "owner": "swift",
             "perm": "0640"
         },
+        {% for ring in swift_extra_ring_files %}
+        {
+            "source": "/var/lib/kolla/swift/{{ ring }}",
+            "dest": "/etc/swift/{{ ring }}",
+            "owner": "swift",
+            "perm": "0640"
+        },
+        {% endfor %}
         {
             "source": "{{ container_config_directory }}/swift.conf",
             "dest": "/etc/swift/swift.conf",

ansible/roles/swift/templates/swift-object-server.json.j2

@@ -13,6 +13,14 @@
             "owner": "swift",
             "perm": "0640"
         },
+        {% for ring in swift_extra_ring_files %}
+        {
+            "source": "/var/lib/kolla/swift/{{ ring }}",
+            "dest": "/etc/swift/{{ ring }}",
+            "owner": "swift",
+            "perm": "0640"
+        },
+        {% endfor %}
         {
             "source": "{{ container_config_directory }}/swift.conf",
             "dest": "/etc/swift/swift.conf",

ansible/roles/swift/templates/swift-object-updater.json.j2

@@ -13,6 +13,14 @@
             "owner": "swift",
             "perm": "0640"
         },
+        {% for ring in swift_extra_ring_files %}
+        {
+            "source": "/var/lib/kolla/swift/{{ ring }}",
+            "dest": "/etc/swift/{{ ring }}",
+            "owner": "swift",
+            "perm": "0640"
+        },
+        {% endfor %}
         {
             "source": "{{ container_config_directory }}/swift.conf",
             "dest": "/etc/swift/swift.conf",

ansible/roles/swift/templates/swift-proxy-server.json.j2

@@ -19,6 +19,14 @@
             "owner": "swift",
             "perm": "0640"
         },
+        {% for ring in swift_extra_ring_files %}
+        {
+            "source": "/var/lib/kolla/swift/{{ ring }}",
+            "dest": "/etc/swift/{{ ring }}",
+            "owner": "swift",
+            "perm": "0640"
+        },
+        {% endfor %}
         {
             "source": "{{ container_config_directory }}/swift.conf",
             "dest": "/etc/swift/swift.conf",