dba2e47fc1
Change the 'cloudkitty_service_names' from a list to a dictionary mapping of services, groups that install those services. This brings the method into line with that used in the os_neutron role in order to implement a more standardised method. The init tasks have been updated to run once and loop through this mapping rather than being included multiple times and re-run against each host. This may potentially reduce role run times. 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. 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. Finally: - 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. Change-Id: Ieb96fac62906ac9eb387edb450df0c0ca9c0ccb2
99 lines
2.9 KiB
YAML
99 lines
2.9 KiB
YAML
---
|
|
# Copyright 2016, Rackspace US, Inc.
|
|
#
|
|
# (C) 2016 Michael Rice <michael.rice@rackspace.com>
|
|
#
|
|
# 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 the system group
|
|
group:
|
|
name: "{{ cloudkitty_system_group_name }}"
|
|
state: "present"
|
|
system: "yes"
|
|
tags:
|
|
- cloudkitty-group
|
|
|
|
- name: Create the cloudkitty system user
|
|
user:
|
|
name: "{{ cloudkitty_system_user_name }}"
|
|
group: "{{ cloudkitty_system_group_name }}"
|
|
comment: "{{ cloudkitty_system_comment }}"
|
|
shell: "{{ cloudkitty_system_shell }}"
|
|
system: "yes"
|
|
createhome: "yes"
|
|
home: "{{ cloudkitty_system_home_folder }}"
|
|
tags:
|
|
- cloudkitty-user
|
|
|
|
- name: Create cloudkitty dir
|
|
file:
|
|
path: "{{ item.path }}"
|
|
state: directory
|
|
owner: "{{ item.owner|default(cloudkitty_system_user_name) }}"
|
|
group: "{{ item.group|default(cloudkitty_system_group_name) }}"
|
|
mode: "{{ item.mode|default('0755') }}"
|
|
with_items:
|
|
- { path: "/openstack", mode: "0755", owner: "root", group: "root" }
|
|
- { path: "/etc/cloudkitty" }
|
|
tags:
|
|
- cloudkitty-dirs
|
|
|
|
- name: Test for log directory or link
|
|
shell: |
|
|
if [ -h "/var/log/cloudkitty" ]; then
|
|
chown -h {{ cloudkitty_system_user_name }}:{{ cloudkitty_system_group_name }} "/var/log/cloudkitty"
|
|
chown -R {{ cloudkitty_system_user_name }}:{{ cloudkitty_system_group_name }} "$(readlink /var/log/cloudkitty)"
|
|
else
|
|
exit 1
|
|
fi
|
|
register: log_dir
|
|
failed_when: false
|
|
changed_when: log_dir.rc != 0
|
|
tags:
|
|
- cloudkitty-dirs
|
|
- cloudkitty-logs
|
|
|
|
- name: Create cloudkitty log dir
|
|
file:
|
|
path: "{{ item.path }}"
|
|
state: directory
|
|
owner: "{{ item.owner|default(cloudkitty_system_user_name) }}"
|
|
group: "{{ item.group|default(cloudkitty_system_group_name) }}"
|
|
mode: "{{ item.mode|default('0755') }}"
|
|
with_items:
|
|
- { path: "/var/log/cloudkitty" }
|
|
when: log_dir.rc != 0
|
|
tags:
|
|
- cloudkitty-dirs
|
|
- cloudkitty-logs
|
|
|
|
- name: Create cloudkitty report dir
|
|
file:
|
|
path: "{{ cloudkitty_output_basepath }}"
|
|
state: directory
|
|
owner: "{{ cloudkitty_system_user_name }}"
|
|
group: "{{ cloudkitty_system_group_name }}"
|
|
mode: 0755
|
|
tags:
|
|
- cloudkitty-dirs
|
|
|
|
- name: Create cloudkitty signing dir
|
|
file:
|
|
path: "{{ cloudkitty_signing_dir }}"
|
|
state: directory
|
|
owner: "{{ cloudkitty_system_user_name }}"
|
|
group: "{{ cloudkitty_system_group_name }}"
|
|
mode: 0700
|
|
tags:
|
|
- cloudkitty-dirs
|