openstack/kolla-ansible
Code Issues Proposed changes

Swift JSON files looking for rings in the wrong place

Browse Source 
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
This commit is contained in:
Paul Bourke 2015-10-08 17:08:56 +00:00
parent 6d2bc05325
commit 71fbf63c88
14 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/swift/templates/swift-account-auditor.json.j2
View File

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

2
ansible/roles/swift/templates/swift-account-reaper.json.j2
View File

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

2
ansible/roles/swift/templates/swift-account-replicator.json.j2
View File

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

2
ansible/roles/swift/templates/swift-account-server.json.j2
View File

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

2
ansible/roles/swift/templates/swift-container-auditor.json.j2
View File

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

2
ansible/roles/swift/templates/swift-container-replicator.json.j2
View File

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

2
ansible/roles/swift/templates/swift-container-server.json.j2
View File

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

4
ansible/roles/swift/templates/swift-container-updater.json.j2
View File

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

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

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

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

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

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

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

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

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

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

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

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

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