4888d5a5d1
This patch updates the work done in https://review.openstack.org/377055 to match up to the implementation in https://review.openstack.org/378613 which aims to bring the implementation in line with the os_neutron role. - The variable ;cinder_service_names; is renamed to 'cinder_services'. - Common variables shared by each service's template files have been updated to use the service namespaced variables. - Unused handlers have been removed. - Unused variables have been removed. - The handler to reload the services now only tries to restart the service if the host is in the group for the service according to the service group mapping. This allows us to ensure that handler failures are no longer ignored and that no execution time is wasted trying to restart services which do not exist on the host. - Currently the reload of upstart/systemd scripts may not happen if only one script changes as the task uses a loop with only one result register. This patch implements handlers to reload upstart/systemd scripts to ensure that this happens when any one of the scripts change. Change-Id: Icca1f3ef930962c1179687b1a7ef4dcce5ca47f2
66 lines
2.0 KiB
YAML
66 lines
2.0 KiB
YAML
---
|
|
# Copyright 2016, Rackspace US, Inc.
|
|
# Copyright 2016, IBM Corporation.
|
|
#
|
|
# 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/{{ item.value.service_name }}"
|
|
state: directory
|
|
owner: "{{ cinder_system_user_name }}"
|
|
group: "{{ cinder_system_group_name }}"
|
|
mode: "02755"
|
|
with_dict: "{{ cinder_services }}"
|
|
when:
|
|
- inventory_hostname in groups[item.value.group]
|
|
- "{{ item.value.condition | default(true) }}"
|
|
|
|
- name: Create TEMP lock dir
|
|
file:
|
|
path: "/var/lock/{{ item.value.service_name }}"
|
|
state: directory
|
|
owner: "{{ cinder_system_user_name }}"
|
|
group: "{{ cinder_system_group_name }}"
|
|
mode: "02755"
|
|
with_dict: "{{ cinder_services }}"
|
|
when:
|
|
- inventory_hostname in groups[item.value.group]
|
|
- "{{ item.value.condition | default(true) }}"
|
|
|
|
- name: Create tempfile.d entry
|
|
template:
|
|
src: "cinder-systemd-tempfiles.j2"
|
|
dest: "/etc/tmpfiles.d/cinder.conf"
|
|
mode: "0644"
|
|
owner: "root"
|
|
group: "root"
|
|
with_dict: "{{ cinder_services }}"
|
|
when:
|
|
- inventory_hostname in groups[item.value.group]
|
|
- "{{ item.value.condition | default(true) }}"
|
|
|
|
- name: Place the systemd init script
|
|
template:
|
|
src: "cinder-systemd-init.j2"
|
|
dest: "/etc/systemd/system/{{ item.value.service_name }}.service"
|
|
mode: "0644"
|
|
owner: "root"
|
|
group: "root"
|
|
with_dict: "{{ cinder_services }}"
|
|
when:
|
|
- inventory_hostname in groups[item.value.group]
|
|
- "{{ item.value.condition | default(true) }}"
|
|
notify:
|
|
- Reload systemd daemon
|