Merge "Swift: add swift_extra_ring_files variable to handle multi-policies deployment"

ansible/roles/swift/defaults/main.yml

@@ -78,6 +78,8 @@ syslog_swift_facility: "local0"
 
 swift_enable_rolling_upgrade: "yes"
 
+swift_extra_ring_files: []
+
 ####################
 # Keystone
 ####################

ansible/roles/swift/tasks/config.yml

@@ -190,6 +190,7 @@
     - "container.ring.gz"
     - "object.builder"
     - "object.ring.gz"
+    - "{{ swift_extra_ring_files }}"
 
 - name: Check if policies shall be overwritten
   local_action: stat path="{{ node_custom_config }}/swift/policy.json"

ansible/roles/swift/tasks/precheck.yml

@@ -108,6 +108,7 @@
     - "container.ring.gz"
     - "object.builder"
     - "object.ring.gz"
+    - "{{ swift_extra_ring_files }}"
 
 - name: Fail if ring files don't exist
   run_once: True

doc/source/reference/storage/swift-guide.rst

@@ -215,6 +215,16 @@ Enable Swift in ``/etc/kolla/globals.yml``:
 
    enable_swift : "yes"
 
+If you are to deploy multiple policies, override the variable
+``swift_extra_ring_files`` with the list of your custom ring files, .builder
+and .ring.gz all together. This will append them to the list of default rings.
+
+.. code-block:: yaml
+
+   swift_extra_ring_files:
+      - object-1.builder
+      - object-1.ring.gz
+
 Once the rings are in place, deploying Swift is the same as any other Kolla
 Ansible service:
 

releasenotes/notes/swift-multi-policies-28bc322b54a82bf9.yaml

+---
+features:
+  - |
+    Add a new variable to be used by the swift role, ``swift_extra_ring_files``.
+    It allows to pass additional ring files to be deployed in the context of
+    a multi-policy setup.