From d1087b98de714b8f6b85bccc59fe820a36733366 Mon Sep 17 00:00:00 2001
From: Marc Gariepy <gariepy.marc@gmail.com>
Date: Thu, 10 Nov 2016 09:44:51 -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: I745d62a70667f8e89fc15f0c07eb011a47c3dbe9
---
 tasks/ironic_init_systemd.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tasks/ironic_init_systemd.yml b/tasks/ironic_init_systemd.yml
index c08e82a7..f02137d1 100644
--- a/tasks/ironic_init_systemd.yml
+++ b/tasks/ironic_init_systemd.yml
@@ -29,10 +29,18 @@
     group: "{{ system_group }}"
     mode: "02755"
 
+# 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/{{ program_name }}.conf"
+    state: absent
+
 - name: Create tmpfiles.d entry
   template:
     src: "ironic-systemd-tmpfiles.j2"
-    dest: "/etc/tmpfiles.d/{{ program_name }}.conf"
+    dest: "/etc/tmpfiles.d/openstack-{{ program_name }}.conf"
     mode: "0644"
     owner: "root"
     group: "root"