From 31bc52f98aa708b03b9c4e2919fcb0b4d3c576a9 Mon Sep 17 00:00:00 2001 From: Yifei Xue Date: Thu, 12 May 2016 15:19:21 +0800 Subject: Add Mitaka package for Ubuntu 14.04 JIRA: COMPASS-387 Change-Id: I62da78a6aa252259265640b3ff84ad77c28fdece Signed-off-by: Yifei Xue --- deploy/adapters/ansible/openstack_mitaka/.gitkeep | 0 .../openstack_mitaka/aodh/handlers/main.yml | 12 +++++++ .../ansible/openstack_mitaka/aodh/tasks/main.yml | 29 +++++++++++++++ .../openstack_mitaka/aodh/templates/aodh.conf.j2 | 41 ++++++++++++++++++++++ .../aodh/templates/api_paste.ini.j2 | 22 ++++++++++++ .../openstack_mitaka/aodh/templates/policy.json.j2 | 20 +++++++++++ .../ansible/openstack_mitaka/aodh/vars/Debian.yml | 22 ++++++++++++ .../ansible/openstack_mitaka/aodh/vars/RedHat.yml | 22 ++++++++++++ .../ansible/openstack_mitaka/aodh/vars/main.yml | 12 +++++++ .../ceilometer_controller/vars/Debian.yml | 37 +++++++++++++++++++ .../ceilometer_controller/vars/RedHat.yml | 36 +++++++++++++++++++ .../openstack_mitaka/common/vars/Debian.yml | 30 ++++++++++++++++ .../adapters/ansible/roles/aodh/handlers/main.yml | 12 ------- deploy/adapters/ansible/roles/aodh/tasks/main.yml | 29 --------------- .../ansible/roles/aodh/templates/aodh.conf.j2 | 41 ---------------------- .../ansible/roles/aodh/templates/api_paste.ini.j2 | 22 ------------ .../ansible/roles/aodh/templates/policy.json.j2 | 20 ----------- deploy/adapters/ansible/roles/aodh/vars/Debian.yml | 22 ------------ deploy/adapters/ansible/roles/aodh/vars/RedHat.yml | 22 ------------ deploy/adapters/ansible/roles/aodh/vars/main.yml | 12 ------- .../roles/ceilometer_controller/vars/Debian.yml | 4 --- .../roles/ceilometer_controller/vars/RedHat.yml | 3 -- 22 files changed, 283 insertions(+), 187 deletions(-) create mode 100644 deploy/adapters/ansible/openstack_mitaka/.gitkeep create mode 100644 deploy/adapters/ansible/openstack_mitaka/aodh/handlers/main.yml create mode 100644 deploy/adapters/ansible/openstack_mitaka/aodh/tasks/main.yml create mode 100644 deploy/adapters/ansible/openstack_mitaka/aodh/templates/aodh.conf.j2 create mode 100644 deploy/adapters/ansible/openstack_mitaka/aodh/templates/api_paste.ini.j2 create mode 100644 deploy/adapters/ansible/openstack_mitaka/aodh/templates/policy.json.j2 create mode 100644 deploy/adapters/ansible/openstack_mitaka/aodh/vars/Debian.yml create mode 100644 deploy/adapters/ansible/openstack_mitaka/aodh/vars/RedHat.yml create mode 100644 deploy/adapters/ansible/openstack_mitaka/aodh/vars/main.yml create mode 100644 deploy/adapters/ansible/openstack_mitaka/ceilometer_controller/vars/Debian.yml create mode 100644 deploy/adapters/ansible/openstack_mitaka/ceilometer_controller/vars/RedHat.yml create mode 100644 deploy/adapters/ansible/openstack_mitaka/common/vars/Debian.yml delete mode 100644 deploy/adapters/ansible/roles/aodh/handlers/main.yml delete mode 100644 deploy/adapters/ansible/roles/aodh/tasks/main.yml delete mode 100644 deploy/adapters/ansible/roles/aodh/templates/aodh.conf.j2 delete mode 100644 deploy/adapters/ansible/roles/aodh/templates/api_paste.ini.j2 delete mode 100644 deploy/adapters/ansible/roles/aodh/templates/policy.json.j2 delete mode 100644 deploy/adapters/ansible/roles/aodh/vars/Debian.yml delete mode 100644 deploy/adapters/ansible/roles/aodh/vars/RedHat.yml delete mode 100644 deploy/adapters/ansible/roles/aodh/vars/main.yml (limited to 'deploy/adapters/ansible') diff --git a/deploy/adapters/ansible/openstack_mitaka/.gitkeep b/deploy/adapters/ansible/openstack_mitaka/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/deploy/adapters/ansible/openstack_mitaka/aodh/handlers/main.yml b/deploy/adapters/ansible/openstack_mitaka/aodh/handlers/main.yml new file mode 100644 index 00000000..e1084c83 --- /dev/null +++ b/deploy/adapters/ansible/openstack_mitaka/aodh/handlers/main.yml @@ -0,0 +1,12 @@ +############################################################################## +# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +- name: restart aodh services + service: name={{ item }} state=restarted enabled=yes + with_items: services diff --git a/deploy/adapters/ansible/openstack_mitaka/aodh/tasks/main.yml b/deploy/adapters/ansible/openstack_mitaka/aodh/tasks/main.yml new file mode 100644 index 00000000..aa23b9e5 --- /dev/null +++ b/deploy/adapters/ansible/openstack_mitaka/aodh/tasks/main.yml @@ -0,0 +1,29 @@ +############################################################################## +# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +- include_vars: "{{ ansible_os_family }}.yml" + +- name: install aodh packages + action: "{{ ansible_pkg_mgr }} name={{ item }} state=present" + with_items: packages | union(packages_noarch) + +- name: update aodh conf + template: src={{ item }} dest=/etc/aodh/{{ item }} + backup=yes + with_items: + - aodh.conf.j2 +# - api_paste.ini.j2 +# - policy.json.j2 + notify: restart aodh services + +- name: write services to monitor list + lineinfile: dest=/opt/service create=yes line='{{ item }}' + with_items: services + +- meta: flush_handlers diff --git a/deploy/adapters/ansible/openstack_mitaka/aodh/templates/aodh.conf.j2 b/deploy/adapters/ansible/openstack_mitaka/aodh/templates/aodh.conf.j2 new file mode 100644 index 00000000..eac6e5bd --- /dev/null +++ b/deploy/adapters/ansible/openstack_mitaka/aodh/templates/aodh.conf.j2 @@ -0,0 +1,41 @@ +[DEFAULT] +bind_host = {{ internal_ip }} +bind_port = 8042 +rpc_backend = rabbit +auth_strategy = keystone +debug = True +verbose = True + +[oslo_messaging_rabbit] +rabbit_hosts = {{ internal_vip.ip }} +rabbit_userid = {{ RABBIT_USER }} +rabbit_password = {{ RABBIT_PASS }} +rabbit_use_ssl = false + +[database] +connection = mongodb://aodh:{{ AODH_DBPASS }}@{{ internal_vip.ip }}:27017/aodh + +[keystone_authtoken] +auth_uri = http://{{ internal_vip.ip }}:5000 +auth_url = http://{{ internal_vip.ip }}:35357 +identity_uri = http://{{ internal_vip.ip }}:35357 +auth_plugin = password +project_domain_id = default +user_domain_id = default +project_name = service +username = aodh +password = {{ AODH_PASS }} +memcached_servers = {{ memcached_servers }} +token_cache_time = 300 +revocation_cache_time = 60 + +[service_credentials] +os_auth_url = http://{{ internal_vip.ip }}:5000/v2.0 +os_username = aodh +os_tenant_name = service +os_password = {{ AODH_PASS }} +os_endpoint_type = internalURL +os_region_name = regionOne + +[api] +host = {{ internal_ip }} diff --git a/deploy/adapters/ansible/openstack_mitaka/aodh/templates/api_paste.ini.j2 b/deploy/adapters/ansible/openstack_mitaka/aodh/templates/api_paste.ini.j2 new file mode 100644 index 00000000..151789c4 --- /dev/null +++ b/deploy/adapters/ansible/openstack_mitaka/aodh/templates/api_paste.ini.j2 @@ -0,0 +1,22 @@ +# aodh API WSGI Pipeline +# Define the filters that make up the pipeline for processing WSGI requests +# Note: This pipeline is PasteDeploy's term rather than aodh's pipeline +# used for processing samples + +# Remove authtoken from the pipeline if you don't want to use keystone authentication +[pipeline:main] +pipeline = cors request_id authtoken api-server + +[app:api-server] +paste.app_factory = aodh.api.app:app_factory + +[filter:authtoken] +paste.filter_factory = keystonemiddleware.auth_token:filter_factory +oslo_config_project = aodh + +[filter:request_id] +paste.filter_factory = oslo_middleware:RequestId.factory + +[filter:cors] +paste.filter_factory = oslo_middleware.cors:filter_factory +oslo_config_project = aodh diff --git a/deploy/adapters/ansible/openstack_mitaka/aodh/templates/policy.json.j2 b/deploy/adapters/ansible/openstack_mitaka/aodh/templates/policy.json.j2 new file mode 100644 index 00000000..4fd873e9 --- /dev/null +++ b/deploy/adapters/ansible/openstack_mitaka/aodh/templates/policy.json.j2 @@ -0,0 +1,20 @@ +{ + "context_is_admin": "role:admin", + "segregation": "rule:context_is_admin", + "admin_or_owner": "rule:context_is_admin or project_id:%(project_id)s", + "default": "rule:admin_or_owner", + + "telemetry:get_alarm": "rule:admin_or_owner", + "telemetry:get_alarms": "rule:admin_or_owner", + "telemetry:query_alarm": "rule:admin_or_owner", + + "telemetry:create_alarm": "", + "telemetry:change_alarm": "rule:admin_or_owner", + "telemetry:delete_alarm": "rule:admin_or_owner", + + "telemetry:get_alarm_state": "rule:admin_or_owner", + "telemetry:change_alarm_state": "rule:admin_or_owner", + + "telemetry:alarm_history": "rule:admin_or_owner", + "telemetry:query_alarm_history": "rule:admin_or_owner" +} diff --git a/deploy/adapters/ansible/openstack_mitaka/aodh/vars/Debian.yml b/deploy/adapters/ansible/openstack_mitaka/aodh/vars/Debian.yml new file mode 100644 index 00000000..bdf4655e --- /dev/null +++ b/deploy/adapters/ansible/openstack_mitaka/aodh/vars/Debian.yml @@ -0,0 +1,22 @@ +############################################################################# +# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################# +--- +packages: + - aodh-api + - aodh-evaluator + - aodh-notifier + - aodh-listener + - aodh-expirer + - python-ceilometerclient + +services: + - aodh-api + - aodh-notifier + - aodh-evaluator + - aodh-listener diff --git a/deploy/adapters/ansible/openstack_mitaka/aodh/vars/RedHat.yml b/deploy/adapters/ansible/openstack_mitaka/aodh/vars/RedHat.yml new file mode 100644 index 00000000..3d182880 --- /dev/null +++ b/deploy/adapters/ansible/openstack_mitaka/aodh/vars/RedHat.yml @@ -0,0 +1,22 @@ +############################################################################# +# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################# +--- +packages: + - openstack-aodh-api + - openstack-aodh-evaluator + - openstack-aodh-notifier + - openstack-aodh-listener + - openstack-aodh-expirer + - python-ceilometerclient + +services: + - aodh-api + - aodh-notifier + - aodh-evaluator + - aodh-listener diff --git a/deploy/adapters/ansible/openstack_mitaka/aodh/vars/main.yml b/deploy/adapters/ansible/openstack_mitaka/aodh/vars/main.yml new file mode 100644 index 00000000..b17f6ed0 --- /dev/null +++ b/deploy/adapters/ansible/openstack_mitaka/aodh/vars/main.yml @@ -0,0 +1,12 @@ +############################################################################## +## Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. +## +## All rights reserved. This program and the accompanying materials +## are made available under the terms of the Apache License, Version 2.0 +## which accompanies this distribution, and is available at +## http://www.apache.org/licenses/LICENSE-2.0 +############################################################################### +--- +packages_noarch: [] + +services_noarch: [] diff --git a/deploy/adapters/ansible/openstack_mitaka/ceilometer_controller/vars/Debian.yml b/deploy/adapters/ansible/openstack_mitaka/ceilometer_controller/vars/Debian.yml new file mode 100644 index 00000000..b749ffaa --- /dev/null +++ b/deploy/adapters/ansible/openstack_mitaka/ceilometer_controller/vars/Debian.yml @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +ceilometer_packages: + - ceilometer-api + - ceilometer-collector + - ceilometer-agent-central + - ceilometer-agent-notification +# - ceilometer-alarm-evaluator +# - ceilometer-alarm-notifier + - python-ceilometerclient + +ceilometer_services: + - ceilometer-agent-central + - ceilometer-agent-notification + - ceilometer-api + - ceilometer-collector +# - ceilometer-alarm-evaluator +# - ceilometer-alarm-notifier + +ceilometer_configs_templates: + - src: ceilometer.j2 + dest: + - /etc/ceilometer/ceilometer.conf + - src: cinder.j2 + dest: + - /etc/cinder/cinder.conf + - src: glance.j2 + dest: + - /etc/glance/glance-api.conf + - /etc/glance/glance-registry.conf diff --git a/deploy/adapters/ansible/openstack_mitaka/ceilometer_controller/vars/RedHat.yml b/deploy/adapters/ansible/openstack_mitaka/ceilometer_controller/vars/RedHat.yml new file mode 100644 index 00000000..6c5f53ec --- /dev/null +++ b/deploy/adapters/ansible/openstack_mitaka/ceilometer_controller/vars/RedHat.yml @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +ceilometer_packages: + - openstack-ceilometer-api + - openstack-ceilometer-collector + - openstack-ceilometer-central + - openstack-ceilometer-notification +# - openstack-ceilometer-alarm + - python-ceilometerclient + +ceilometer_services: + - openstack-ceilometer-central + - openstack-ceilometer-notification + - openstack-ceilometer-api + - openstack-ceilometer-collector +# - openstack-ceilometer-alarm-evaluator +# - openstack-ceilometer-alarm-notifier + +ceilometer_configs_templates: + - src: ceilometer.j2 + dest: + - /etc/ceilometer/ceilometer.conf + - src: cinder.j2 + dest: + - /etc/cinder/cinder.conf + - src: glance.j2 + dest: + - /etc/glance/glance-api.conf + - /etc/glance/glance-registry.conf diff --git a/deploy/adapters/ansible/openstack_mitaka/common/vars/Debian.yml b/deploy/adapters/ansible/openstack_mitaka/common/vars/Debian.yml new file mode 100644 index 00000000..980bcac9 --- /dev/null +++ b/deploy/adapters/ansible/openstack_mitaka/common/vars/Debian.yml @@ -0,0 +1,30 @@ +############################################################################## +# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +packages: + - ubuntu-cloud-keyring + #- python-dev + - openvswitch-datapath-dkms + - openvswitch-switch + - python-memcache + - python-iniparse + - python-lxml +# - python-d* #TODO, need remove + +pip_packages: + - crudini + - python-keyczar + - yang2tosca + +pip_conf: pip.conf + +services: + - ntp + + diff --git a/deploy/adapters/ansible/roles/aodh/handlers/main.yml b/deploy/adapters/ansible/roles/aodh/handlers/main.yml deleted file mode 100644 index e1084c83..00000000 --- a/deploy/adapters/ansible/roles/aodh/handlers/main.yml +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################## -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -- name: restart aodh services - service: name={{ item }} state=restarted enabled=yes - with_items: services diff --git a/deploy/adapters/ansible/roles/aodh/tasks/main.yml b/deploy/adapters/ansible/roles/aodh/tasks/main.yml deleted file mode 100644 index aa23b9e5..00000000 --- a/deploy/adapters/ansible/roles/aodh/tasks/main.yml +++ /dev/null @@ -1,29 +0,0 @@ -############################################################################## -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -- include_vars: "{{ ansible_os_family }}.yml" - -- name: install aodh packages - action: "{{ ansible_pkg_mgr }} name={{ item }} state=present" - with_items: packages | union(packages_noarch) - -- name: update aodh conf - template: src={{ item }} dest=/etc/aodh/{{ item }} - backup=yes - with_items: - - aodh.conf.j2 -# - api_paste.ini.j2 -# - policy.json.j2 - notify: restart aodh services - -- name: write services to monitor list - lineinfile: dest=/opt/service create=yes line='{{ item }}' - with_items: services - -- meta: flush_handlers diff --git a/deploy/adapters/ansible/roles/aodh/templates/aodh.conf.j2 b/deploy/adapters/ansible/roles/aodh/templates/aodh.conf.j2 deleted file mode 100644 index eac6e5bd..00000000 --- a/deploy/adapters/ansible/roles/aodh/templates/aodh.conf.j2 +++ /dev/null @@ -1,41 +0,0 @@ -[DEFAULT] -bind_host = {{ internal_ip }} -bind_port = 8042 -rpc_backend = rabbit -auth_strategy = keystone -debug = True -verbose = True - -[oslo_messaging_rabbit] -rabbit_hosts = {{ internal_vip.ip }} -rabbit_userid = {{ RABBIT_USER }} -rabbit_password = {{ RABBIT_PASS }} -rabbit_use_ssl = false - -[database] -connection = mongodb://aodh:{{ AODH_DBPASS }}@{{ internal_vip.ip }}:27017/aodh - -[keystone_authtoken] -auth_uri = http://{{ internal_vip.ip }}:5000 -auth_url = http://{{ internal_vip.ip }}:35357 -identity_uri = http://{{ internal_vip.ip }}:35357 -auth_plugin = password -project_domain_id = default -user_domain_id = default -project_name = service -username = aodh -password = {{ AODH_PASS }} -memcached_servers = {{ memcached_servers }} -token_cache_time = 300 -revocation_cache_time = 60 - -[service_credentials] -os_auth_url = http://{{ internal_vip.ip }}:5000/v2.0 -os_username = aodh -os_tenant_name = service -os_password = {{ AODH_PASS }} -os_endpoint_type = internalURL -os_region_name = regionOne - -[api] -host = {{ internal_ip }} diff --git a/deploy/adapters/ansible/roles/aodh/templates/api_paste.ini.j2 b/deploy/adapters/ansible/roles/aodh/templates/api_paste.ini.j2 deleted file mode 100644 index 151789c4..00000000 --- a/deploy/adapters/ansible/roles/aodh/templates/api_paste.ini.j2 +++ /dev/null @@ -1,22 +0,0 @@ -# aodh API WSGI Pipeline -# Define the filters that make up the pipeline for processing WSGI requests -# Note: This pipeline is PasteDeploy's term rather than aodh's pipeline -# used for processing samples - -# Remove authtoken from the pipeline if you don't want to use keystone authentication -[pipeline:main] -pipeline = cors request_id authtoken api-server - -[app:api-server] -paste.app_factory = aodh.api.app:app_factory - -[filter:authtoken] -paste.filter_factory = keystonemiddleware.auth_token:filter_factory -oslo_config_project = aodh - -[filter:request_id] -paste.filter_factory = oslo_middleware:RequestId.factory - -[filter:cors] -paste.filter_factory = oslo_middleware.cors:filter_factory -oslo_config_project = aodh diff --git a/deploy/adapters/ansible/roles/aodh/templates/policy.json.j2 b/deploy/adapters/ansible/roles/aodh/templates/policy.json.j2 deleted file mode 100644 index 4fd873e9..00000000 --- a/deploy/adapters/ansible/roles/aodh/templates/policy.json.j2 +++ /dev/null @@ -1,20 +0,0 @@ -{ - "context_is_admin": "role:admin", - "segregation": "rule:context_is_admin", - "admin_or_owner": "rule:context_is_admin or project_id:%(project_id)s", - "default": "rule:admin_or_owner", - - "telemetry:get_alarm": "rule:admin_or_owner", - "telemetry:get_alarms": "rule:admin_or_owner", - "telemetry:query_alarm": "rule:admin_or_owner", - - "telemetry:create_alarm": "", - "telemetry:change_alarm": "rule:admin_or_owner", - "telemetry:delete_alarm": "rule:admin_or_owner", - - "telemetry:get_alarm_state": "rule:admin_or_owner", - "telemetry:change_alarm_state": "rule:admin_or_owner", - - "telemetry:alarm_history": "rule:admin_or_owner", - "telemetry:query_alarm_history": "rule:admin_or_owner" -} diff --git a/deploy/adapters/ansible/roles/aodh/vars/Debian.yml b/deploy/adapters/ansible/roles/aodh/vars/Debian.yml deleted file mode 100644 index bdf4655e..00000000 --- a/deploy/adapters/ansible/roles/aodh/vars/Debian.yml +++ /dev/null @@ -1,22 +0,0 @@ -############################################################################# -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################# ---- -packages: - - aodh-api - - aodh-evaluator - - aodh-notifier - - aodh-listener - - aodh-expirer - - python-ceilometerclient - -services: - - aodh-api - - aodh-notifier - - aodh-evaluator - - aodh-listener diff --git a/deploy/adapters/ansible/roles/aodh/vars/RedHat.yml b/deploy/adapters/ansible/roles/aodh/vars/RedHat.yml deleted file mode 100644 index 3d182880..00000000 --- a/deploy/adapters/ansible/roles/aodh/vars/RedHat.yml +++ /dev/null @@ -1,22 +0,0 @@ -############################################################################# -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################# ---- -packages: - - openstack-aodh-api - - openstack-aodh-evaluator - - openstack-aodh-notifier - - openstack-aodh-listener - - openstack-aodh-expirer - - python-ceilometerclient - -services: - - aodh-api - - aodh-notifier - - aodh-evaluator - - aodh-listener diff --git a/deploy/adapters/ansible/roles/aodh/vars/main.yml b/deploy/adapters/ansible/roles/aodh/vars/main.yml deleted file mode 100644 index b17f6ed0..00000000 --- a/deploy/adapters/ansible/roles/aodh/vars/main.yml +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################## -## Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. -## -## All rights reserved. This program and the accompanying materials -## are made available under the terms of the Apache License, Version 2.0 -## which accompanies this distribution, and is available at -## http://www.apache.org/licenses/LICENSE-2.0 -############################################################################### ---- -packages_noarch: [] - -services_noarch: [] diff --git a/deploy/adapters/ansible/roles/ceilometer_controller/vars/Debian.yml b/deploy/adapters/ansible/roles/ceilometer_controller/vars/Debian.yml index 6615317d..55f5aa19 100644 --- a/deploy/adapters/ansible/roles/ceilometer_controller/vars/Debian.yml +++ b/deploy/adapters/ansible/roles/ceilometer_controller/vars/Debian.yml @@ -12,8 +12,6 @@ ceilometer_packages: - ceilometer-collector - ceilometer-agent-central - ceilometer-agent-notification - - ceilometer-alarm-evaluator - - ceilometer-alarm-notifier - python-ceilometerclient ceilometer_services: @@ -21,8 +19,6 @@ ceilometer_services: - ceilometer-agent-notification - ceilometer-api - ceilometer-collector - - ceilometer-alarm-evaluator - - ceilometer-alarm-notifier ceilometer_configs_templates: - src: ceilometer.j2 diff --git a/deploy/adapters/ansible/roles/ceilometer_controller/vars/RedHat.yml b/deploy/adapters/ansible/roles/ceilometer_controller/vars/RedHat.yml index f1eb4e5b..86f464a5 100644 --- a/deploy/adapters/ansible/roles/ceilometer_controller/vars/RedHat.yml +++ b/deploy/adapters/ansible/roles/ceilometer_controller/vars/RedHat.yml @@ -12,7 +12,6 @@ ceilometer_packages: - openstack-ceilometer-collector - openstack-ceilometer-central - openstack-ceilometer-notification - - openstack-ceilometer-alarm - python-ceilometerclient ceilometer_services: @@ -20,8 +19,6 @@ ceilometer_services: - openstack-ceilometer-notification - openstack-ceilometer-api - openstack-ceilometer-collector - - openstack-ceilometer-alarm-evaluator - - openstack-ceilometer-alarm-notifier ceilometer_configs_templates: - src: ceilometer.j2 -- cgit 1.2.3-korg