779d6b454a
The os_aodh role fails to run when aodh_venv_enabled is set to false. This is because the role searches for an aodh binary which does not exist. This commit updates os_aodh to search for aodh-api instead, which is a valid binary installed by aodh. Change-Id: Ic64d1cb8a301c0716e6cd05554b7806847769472 Closes-Bug: #1508052
58 lines
1.7 KiB
YAML
58 lines
1.7 KiB
YAML
---
|
|
# Copyright 2015, 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: Get aodh command path
|
|
command: which aodh-api
|
|
register: aodh_command_path
|
|
when:
|
|
- not aodh_venv_enabled | bool
|
|
tags:
|
|
- aodh-command-bin
|
|
|
|
- name: Set aodh command path
|
|
set_fact:
|
|
aodh_bin: "{{ aodh_command_path.stdout | dirname }}"
|
|
when:
|
|
- not aodh_venv_enabled | bool
|
|
tags:
|
|
- aodh-command-bin
|
|
|
|
- name: Copy aodh config
|
|
config_template:
|
|
src: "{{ item.src }}"
|
|
dest: "{{ item.dest }}"
|
|
owner: "{{ aodh_system_user_name }}"
|
|
group: "{{ aodh_system_group_name }}"
|
|
mode: "0644"
|
|
config_overrides: "{{ item.config_overrides }}"
|
|
config_type: "{{ item.config_type }}"
|
|
with_items:
|
|
- src: "aodh.conf.j2"
|
|
dest: "/etc/aodh/aodh.conf"
|
|
config_overrides: "{{ aodh_aodh_conf_overrides }}"
|
|
config_type: "ini"
|
|
- src: "api_paste.ini.j2"
|
|
dest: "/etc/aodh/api_paste.ini"
|
|
config_overrides: "{{ aodh_api_paste_ini_overrides }}"
|
|
config_type: "ini"
|
|
- src: "policy.json"
|
|
dest: "/etc/aodh/policy.json"
|
|
config_overrides: "{{ aodh_policy_overrides }}"
|
|
config_type: "json"
|
|
notify: Restart aodh services
|
|
tags:
|
|
- aodh-config
|
|
- aodh-post-install
|