Fix tmpfiles.d when multiple service are running.

- adding {{ monasca_lock_path }} for the monasca lock dir.

Change-Id: I4b6f1e72873b8e11ab805467d59cb45ba9a55af3

defaults/main.yml

@@ -28,6 +28,7 @@ monasca_system_user_home: "/var/lib/{{ monasca_system_user_name }}"
 monasca_bin: "/openstack/venvs/monasca-{{ monasca_venv_tag }}/bin"
 monasca_log_directory: "/var/log/monasca"
 monasca_conf_directory: "/etc/monasca"
+monasca_lock_path: "/var/lock/monasca"
 
 monasca_service_name: monasca
 monasca_service_user_name: monasca

tasks/monasca_init_systemd.yml

@@ -36,7 +36,7 @@
 - name: Create tempfile.d entry
   template:
     src: "monasca-systemd-tempfiles.j2"
-    dest: "/etc/tmpfiles.d/monasca.conf"
+    dest: "/etc/tmpfiles.d/{{ item.value.service_name }}.conf"
     mode: "0644"
     owner: "root"
     group: "root"

tasks/pre-install.yml

@@ -46,6 +46,7 @@
   with_items:
     - path: "{{ monasca_conf_directory }}"
     - path: "{{ monasca_system_user_home }}"
+    - path: "{{ monasca_lock_path }}"
 
 - name: Test for monasca log directory or link
   shell: |

templates/monasca-api.conf.j2

@@ -28,6 +28,10 @@ delegate_authorized_roles = admin
 [messaging]
 driver = monasca_api.common.messaging.kafka_publisher:KafkaPublisher
 
+# Concurrency (locking mechanisms)
+[oslo_concurrency]
+lock_path = {{ monasca_lock_path }}
+
 [repositories]
 metrics_driver = {{ monasca_api_metrics_driver }}
 alarm_definitions_driver = monasca_api.common.repositories.sqla.alarm_definitions_repository:AlarmDefinitionsRepository

templates/monasca-log-api.conf.j2

@@ -25,6 +25,10 @@ logs_v3 = monasca_log_api.reference.v3.logs:Logs
 versions = monasca_log_api.reference.versions:Versions
 healthchecks = monasca_log_api.reference.healthchecks:HealthChecks
 
+# Concurrency (locking mechanisms)
+[oslo_concurrency]
+lock_path = {{ monasca_lock_path }}
+
 [keystone_authtoken]
 auth_uri = {{ keystone_service_internalurl }}
 auth_version = v3

templates/monasca-systemd-tempfiles.j2

@@ -2,3 +2,4 @@
 
 D /var/lock/{{ item.value.service_name }} 2755 {{ monasca_system_user_name }} {{ monasca_system_group_name }}
 D /var/run/{{ item.value.service_name }} 2755 {{ monasca_system_user_name }} {{ monasca_system_group_name }}
+D {{ monasca_lock_path }} 2755 {{ monasca_system_user_name }} {{ monasca_system_group_name }}