aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-01-26 19:42:56 +0000
committerGerrit Code Review <review@openstack.org>2016-01-26 19:42:56 +0000
commit6c35db368358b68caf48304b7c3a3b1b9f1f72d8 (patch)
tree850ece311d9c48b75e629b86cfb5fcb6512e4a64
parentb3310d0c7e9acd0193f58de25b08dfb0c0501395 (diff)
parent654fe9e585ac5d7f9639c14d3352dd22170a86db (diff)
downloadkolla-6c35db368358b68caf48304b7c3a3b1b9f1f72d8.tar.gz
kolla-6c35db368358b68caf48304b7c3a3b1b9f1f72d8.zip
Merge "Fix swift.conf.j2 so that merge_configs can recognize"
-rw-r--r--ansible/roles/swift/tasks/config.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/ansible/roles/swift/tasks/config.yml b/ansible/roles/swift/tasks/config.yml
index 29410f78a..ddc3e16f6 100644
--- a/ansible/roles/swift/tasks/config.yml
+++ b/ansible/roles/swift/tasks/config.yml
@@ -48,7 +48,7 @@
vars:
service_name: "swift-{{ item }}"
sources:
- - "roles/swift/templates/swift.conf.j2"
+ - "{{ role_path }}/templates/swift.conf.j2"
- "/etc/kolla/config/global.conf"
- "/etc/kolla/config/swift.conf"
- "/etc/kolla/config/swift/{{ item }}.conf"