c4f45f5f08
This patch does the following: - updates the Master SHAs for new development work. - includes updates to policy, paste and rootwrap files as required - moves the Aodh repository to openstack_services as it now has implemented a stable branch - Updated the keystone-wsgi file as it was still running the code from liberty - add 2 package requirements to keystone which must be present for the new wsgi file. - updates tempest.conf.j2 to replace ssh_auth_method with auth_method, and change auth_method to 'keypair' (configured is no longer an a valid option) Change-Id: I933c24c03518865d9d40519dafb2ba46769a5453 Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>
95 lines
3.3 KiB
YAML
95 lines
3.3 KiB
YAML
---
|
|
# Copyright 2014, 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: Copy ceilometer config
|
|
config_template:
|
|
src: "{{ item.src }}"
|
|
dest: "{{ item.dest }}"
|
|
owner: "{{ ceilometer_system_user_name }}"
|
|
group: "{{ ceilometer_system_group_name }}"
|
|
mode: "0644"
|
|
config_overrides: "{{ item.config_overrides }}"
|
|
config_type: "{{ item.config_type }}"
|
|
with_items:
|
|
- src: "ceilometer.conf.j2"
|
|
dest: "/etc/ceilometer/ceilometer.conf"
|
|
config_overrides: "{{ ceilometer_ceilometer_conf_overrides }}"
|
|
config_type: "ini"
|
|
- src: "api_paste.ini.j2"
|
|
dest: "/etc/ceilometer/api_paste.ini"
|
|
config_overrides: "{{ ceilometer_api_paste_ini_overrides }}"
|
|
config_type: "ini"
|
|
- src: "rootwrap.conf.j2"
|
|
dest: "/etc/ceilometer/rootwrap.conf"
|
|
config_overrides: "{{ ceilometer_rootwrap_conf_overrides }}"
|
|
config_type: "ini"
|
|
- src: "event_pipeline.yaml.j2"
|
|
dest: "/etc/ceilometer/event_pipeline.yaml"
|
|
config_overrides: "{{ ceilometer_event_pipeline_yaml_overrides }}"
|
|
config_type: "yaml"
|
|
- src: "event_definitions.yaml.j2"
|
|
dest: "/etc/ceilometer/event_definitions.yaml"
|
|
config_overrides: "{{ ceilometer_event_definitions_yaml_overrides }}"
|
|
config_type: "yaml"
|
|
- src: "pipeline.yaml.j2"
|
|
dest: "/etc/ceilometer/pipeline.yaml"
|
|
config_overrides: "{{ ceilometer_pipeline_yaml_overrides }}"
|
|
config_type: "yaml"
|
|
- src: "gnocchi_resources.yaml.j2"
|
|
dest: "/etc/ceilometer/gnocchi_resources.yaml"
|
|
config_overrides: "{{ ceilometer_gnocci_resources_yaml_overrides }}"
|
|
config_type: "yaml"
|
|
- src: "osprofiler_event_definitions.yaml.j2"
|
|
dest: "/etc/ceilometer/osprofiler_event_definitions.yaml"
|
|
config_overrides: "{{ ceilometer_osprofiler_event_definitions_yaml_overrides }}"
|
|
config_type: "yaml"
|
|
- src: "policy.json.j2"
|
|
dest: "/etc/ceilometer/policy.json"
|
|
config_overrides: "{{ ceilometer_policy_overrides }}"
|
|
config_type: "json"
|
|
notify: Restart ceilometer services
|
|
tags:
|
|
- ceilometer-config
|
|
- ceilometer-post-install
|
|
|
|
- name: Drop rootwrap filters
|
|
copy:
|
|
src: "{{ item.src }}"
|
|
dest: "{{ item.dest }}"
|
|
owner: "{{ ceilometer_system_user_name }}"
|
|
group: "{{ ceilometer_system_group_name }}"
|
|
with_items:
|
|
- { src: "rootwrap.d/ipmi.filters", dest: "/etc/ceilometer/rootwrap.d/ipmi.filters" }
|
|
notify:
|
|
- Restart ceilometer services
|
|
tags:
|
|
- ceilometer-config
|
|
|
|
- name: Get ceilometer command path
|
|
command: which ceilometer
|
|
register: ceilometer_command_path
|
|
when:
|
|
- not ceilometer_venv_enabled | bool
|
|
tags:
|
|
- ceilometer-command-bin
|
|
|
|
- name: Set ceilometer command path
|
|
set_fact:
|
|
ceilometer_bin: "{{ ceilometer_command_path.stdout | dirname }}"
|
|
when:
|
|
- not ceilometer_venv_enabled | bool
|
|
tags:
|
|
- ceilometer-command-bin
|