openstack/kolla-ansible
Code Issues Proposed changes

Merge "Update swift templates to support swift_extra_ring_files"

Browse Source
This commit is contained in:
Zuul 2019-10-26 14:30:12 +00:00 committed by Gerrit Code Review
commit a654649be5
7 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ansible/roles/swift/templates/swift-object-auditor.json.j2
View File

@ -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",

8
ansible/roles/swift/templates/swift-object-expirer.json.j2
View File

@ -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",

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

@ -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",

8
ansible/roles/swift/templates/swift-object-replicator.json.j2
View File

@ -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",

8
ansible/roles/swift/templates/swift-object-server.json.j2
View File

@ -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",

8
ansible/roles/swift/templates/swift-object-updater.json.j2
View File

@ -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",

8
ansible/roles/swift/templates/swift-proxy-server.json.j2
View File

@ -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",