From f281a4844da3defe10d7873cb60461a48b3ba7e2 Mon Sep 17 00:00:00 2001
From: Major Hayden <major@mhtx.net>
Date: Mon, 20 Feb 2017 16:42:06 -0500
Subject: [PATCH] Add program name to neutron init tasks

This patch adds the program name to the neutron init tasks so that
it's easier to review the logs and determine which services are
being changed. It also brings the systemd tasks into the common tasks
file since all supported distributions have systemd available.

Change-Id: Ic0dbab2a5fefe411331867639e236a82a0b32985
---
 tasks/neutron_init_common.yml  | 40 +++++++++++++++++++---
 tasks/neutron_init_systemd.yml | 61 ----------------------------------
 2 files changed, 35 insertions(+), 66 deletions(-)
 delete mode 100644 tasks/neutron_init_systemd.yml

diff --git a/tasks/neutron_init_common.yml b/tasks/neutron_init_common.yml
index 5b5e68e9..afe62d5b 100644
--- a/tasks/neutron_init_common.yml
+++ b/tasks/neutron_init_common.yml
@@ -13,14 +13,44 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- include: neutron_init_systemd.yml
-  when:
-    - ansible_service_mgr == 'systemd'
+- name: "Create TEMP run dir for {{ program_name }}"
+  file:
+    path: "/var/run/{{ program_name }}"
+    state: directory
+    owner: "{{ system_user }}"
+    group: "{{ system_group }}"
+    mode: "02755"
 
-- name: Load service
+- name: "Create TEMP lock dir for {{ program_name }}"
+  file:
+    path: "/var/lock/{{ program_name }}"
+    state: directory
+    owner: "{{ system_user }}"
+    group: "{{ system_group }}"
+    mode: "02755"
+
+- name: "Create tmpfiles.d entry for {{ program_name }}"
+  template:
+    src: "neutron-systemd-tmpfiles.j2"
+    dest: "/etc/tmpfiles.d/openstack-{{ program_name }}.conf"
+    mode: "0644"
+    owner: "root"
+    group: "root"
+
+- name: "Place the systemd init script for {{ program_name }}"
+  template:
+    src: "neutron-systemd-init.j2"
+    dest: "/etc/systemd/system/{{ program_name }}.service"
+    mode: "0644"
+    owner: "root"
+    group: "root"
+  register: systemd_init
+
+- name: "Load {{ program_name }} service"
   service:
     name: "{{ program_name }}"
-    enabled: "yes"
+    enabled: yes
     state: started
+    daemon_reload: yes
   notify:
     - Restart neutron services
diff --git a/tasks/neutron_init_systemd.yml b/tasks/neutron_init_systemd.yml
deleted file mode 100644
index 50c17c7f..00000000
--- a/tasks/neutron_init_systemd.yml
+++ /dev/null
@@ -1,61 +0,0 @@
----
-# Copyright 2016, Rackspace US, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-- name: Create TEMP run dir
-  file:
-    path: "/var/run/{{ program_name }}"
-    state: directory
-    owner: "{{ system_user }}"
-    group: "{{ system_group }}"
-    mode: "02755"
-
-- name: Create TEMP lock dir
-  file:
-    path: "/var/lock/{{ program_name }}"
-    state: directory
-    owner: "{{ system_user }}"
-    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: "neutron-systemd-tmpfiles.j2"
-    dest: "/etc/tmpfiles.d/openstack-{{ program_name }}.conf"
-    mode: "0644"
-    owner: "root"
-    group: "root"
-
-- name: Place the systemd init script
-  template:
-    src: "neutron-systemd-init.j2"
-    dest: "/etc/systemd/system/{{ program_name }}.service"
-    mode: "0644"
-    owner: "root"
-    group: "root"
-  register: systemd_init
-
-- name: Reload the systemd daemon
-  command: "systemctl daemon-reload"
-  when: systemd_init | changed
-  notify:
-    - Restart neutron services