From 6846f56aefc397ca99a5b4bb6c56c8e1d52ed846 Mon Sep 17 00:00:00 2001
From: Marc Gariepy <gariepy.marc@gmail.com>
Date: Thu, 10 Nov 2016 09:47:24 -0500
Subject: [PATCH] Rename tmpfiles.d files

On CentOS /run/lock is created by /usr/lib/tmpfiles.d/legacy.conf file
which can be run after other conf we create for opentack services.
This patch rename the service files to openstack-service.conf to ensure
it is ran after legacy.conf

Change-Id: I3ff9bd09b639acdd77df6d7e48c7389c6f6f085d
---
 tasks/nova_init_systemd.yml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/tasks/nova_init_systemd.yml b/tasks/nova_init_systemd.yml
index 06a5af89..0374e0ec 100644
--- a/tasks/nova_init_systemd.yml
+++ b/tasks/nova_init_systemd.yml
@@ -33,10 +33,20 @@
   with_dict: "{{ nova_services }}"
   when: inventory_hostname in groups[item.value.group]
 
+# TODO(mgariepy):
+# Remove this in Pike as it only needed to handle upgrades
+# from Newton->Newton and Newton->Ocata
+- name: Cleanup old tmpfiles.d entry
+  file:
+    path: "/etc/tmpfiles.d/{{ item.value.service_name }}.conf"
+    state: absent
+  with_dict: "{{ nova_services }}"
+  when: inventory_hostname in groups[item.value.group]
+
 - name: Create tmpfiles.d entry
   template:
     src: "nova-systemd-tmpfiles.j2"
-    dest: "/etc/tmpfiles.d/{{ item.value.service_name }}.conf"
+    dest: "/etc/tmpfiles.d/openstack-{{ item.value.service_name }}.conf"
     mode: "0644"
     owner: "root"
     group: "root"