Merge "Change recon_lock_path to /var/lock"

playbooks/roles/os_swift/tasks/swift_pre_install.yml

@@ -67,7 +67,6 @@
     - { path: "/etc/swift/ring_build_files" }
     - { path: "/openstack/log/{{ inventory_hostname }}", owner: "syslog", group: "syslog" }
     - { path: "/var/cache/swift" }
-    - { path: "/var/lock/swift" }
     - { path: "{{ swift_system_home_folder }}" }
   tags:
     - swift-dirs

playbooks/roles/os_swift/templates/account-server.conf.j2

@@ -31,7 +31,7 @@ use = egg:swift#healthcheck
 use = egg:swift#recon
 log_facility = LOG_LOCAL2
 recon_cache_path = /var/cache/swift
-recon_lock_path = /var/lock/swift
+recon_lock_path = /var/lock
 
 {% if swift.replication_network is not defined or swift.replication_network == swift.storage_network %}
 [account-replicator]

playbooks/roles/os_swift/templates/container-server.conf.j2

@@ -32,7 +32,7 @@ use = egg:swift#healthcheck
 use = egg:swift#recon
 log_facility = LOG_LOCAL3
 recon_cache_path = /var/cache/swift
-recon_lock_path = /var/lock/swift
+recon_lock_path = /var/lock
 
 {% if swift.replication_network is not defined or swift.replication_network == swift.storage_network %}
 [container-replicator]

playbooks/roles/os_swift/templates/object-server.conf.j2

@@ -33,7 +33,7 @@ use = egg:swift#healthcheck
 use = egg:swift#recon
 log_facility = LOG_LOCAL4
 recon_cache_path = /var/cache/swift
-recon_lock_path = /var/lock/swift
+recon_lock_path = /var/lock
 
 {% if swift.replication_network is not defined or swift.replication_network == swift.storage_network %}
 [object-replicator]