From 3bc1fe012f53ae38ce8fc1c9370ed499bdbb3b26 Mon Sep 17 00:00:00 2001 From: liyuenan Date: Sat, 26 Nov 2016 14:29:38 +0800 Subject: Support aodh for Newton JIRA: COMPASS-491 Change-Id: I209aec69eec1376432807b44c0a0e890261f3dff Signed-off-by: liyuenan --- .../HA-ansible-multinodes.yml | 2 +- .../roles/aodh/tasks/aodh_install.yml | 5 +-- .../roles/aodh/templates/aodh.conf.j2 | 38 +++++++++++----------- .../roles/aodh/templates/api_paste.ini.j2 | 22 ------------- .../roles/aodh/templates/policy.json.j2 | 20 ------------ .../roles/aodh/vars/Debian.yml | 2 +- .../roles/aodh/vars/RedHat.yml | 2 +- .../roles/nova-compute/templates/nova.conf | 2 +- 8 files changed, 24 insertions(+), 69 deletions(-) delete mode 100644 deploy/adapters/ansible/openstack_newton_xenial/roles/aodh/templates/api_paste.ini.j2 delete mode 100644 deploy/adapters/ansible/openstack_newton_xenial/roles/aodh/templates/policy.json.j2 (limited to 'deploy') diff --git a/deploy/adapters/ansible/openstack_newton_xenial/HA-ansible-multinodes.yml b/deploy/adapters/ansible/openstack_newton_xenial/HA-ansible-multinodes.yml index 25847ce5..236035e0 100644 --- a/deploy/adapters/ansible/openstack_newton_xenial/HA-ansible-multinodes.yml +++ b/deploy/adapters/ansible/openstack_newton_xenial/HA-ansible-multinodes.yml @@ -74,7 +74,7 @@ - ceilometer_controller - dashboard - heat -# - aodh + - aodh - hosts: all remote_user: root diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/aodh/tasks/aodh_install.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/aodh/tasks/aodh_install.yml index eb51fbea..d8a82270 100644 --- a/deploy/adapters/ansible/openstack_newton_xenial/roles/aodh/tasks/aodh_install.yml +++ b/deploy/adapters/ansible/openstack_newton_xenial/roles/aodh/tasks/aodh_install.yml @@ -14,12 +14,9 @@ with_items: packages | union(packages_noarch) - name: update aodh conf - template: src={{ item }} dest=/etc/aodh/aodh.conf - backup=yes + template: src={{ item }} dest=/etc/aodh/aodh.conf backup=yes with_items: - aodh.conf.j2 -# - api_paste.ini.j2 -# - policy.json.j2 notify: - restart aodh services diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/aodh/templates/aodh.conf.j2 b/deploy/adapters/ansible/openstack_newton_xenial/roles/aodh/templates/aodh.conf.j2 index b580d78c..d9eb0599 100644 --- a/deploy/adapters/ansible/openstack_newton_xenial/roles/aodh/templates/aodh.conf.j2 +++ b/deploy/adapters/ansible/openstack_newton_xenial/roles/aodh/templates/aodh.conf.j2 @@ -5,17 +5,16 @@ {% set memcached_servers = memcached_servers|join(',') %} [DEFAULT] +transport_url = rabbit://{{ RABBIT_USER }}:{{ RABBIT_PASS }}@{{ rabbit_host }} +rpc_backend = rabbit + bind_host = {{ internal_ip }} bind_port = 8042 -rpc_backend = rabbit auth_strategy = keystone debug = True -[oslo_messaging_rabbit] -rabbit_hosts = {{ internal_vip.ip }} -rabbit_userid = {{ RABBIT_USER }} -rabbit_password = {{ RABBIT_PASS }} -#rabbit_use_ssl = false +[api] +host = {{ internal_ip }} [database] connection = mysql://aodh:{{ AODH_DBPASS }}@{{ db_host }}/aodh @@ -23,25 +22,27 @@ connection = mysql://aodh:{{ AODH_DBPASS }}@{{ db_host }}/aodh [keystone_authtoken] auth_uri = http://{{ internal_vip.ip }}:5000 auth_url = http://{{ internal_vip.ip }}:35357 +memcached_servers = {{ memcached_servers }} +auth_type = password +project_domain_name = default +user_domain_name = default +project_name = service +username = aodh +password = {{ AODH_PASS }} + 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/v3 -os_username = aodh -os_tenant_name = service -os_password = {{ AODH_PASS }} -os_endpoint_type = internalURL -os_region_name = RegionOne +[oslo_messaging_rabbit] +rabbit_hosts = {{ internal_vip.ip }} +rabbit_userid = {{ RABBIT_USER }} +rabbit_password = {{ RABBIT_PASS }} +[service_credentials] auth_type = password auth_url = http://{{ internal_vip.ip }}:5000/v3 project_domain_name = default @@ -52,5 +53,4 @@ password = {{ AODH_PASS }} interface = internalURL region_name = RegionOne -[api] -host = {{ internal_ip }} +endpoint_type = internalURL diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/aodh/templates/api_paste.ini.j2 b/deploy/adapters/ansible/openstack_newton_xenial/roles/aodh/templates/api_paste.ini.j2 deleted file mode 100644 index 151789c4..00000000 --- a/deploy/adapters/ansible/openstack_newton_xenial/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/openstack_newton_xenial/roles/aodh/templates/policy.json.j2 b/deploy/adapters/ansible/openstack_newton_xenial/roles/aodh/templates/policy.json.j2 deleted file mode 100644 index 4fd873e9..00000000 --- a/deploy/adapters/ansible/openstack_newton_xenial/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/openstack_newton_xenial/roles/aodh/vars/Debian.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/aodh/vars/Debian.yml index bdf4655e..9bf4ad7a 100644 --- a/deploy/adapters/ansible/openstack_newton_xenial/roles/aodh/vars/Debian.yml +++ b/deploy/adapters/ansible/openstack_newton_xenial/roles/aodh/vars/Debian.yml @@ -13,7 +13,7 @@ packages: - aodh-notifier - aodh-listener - aodh-expirer - - python-ceilometerclient + - python-aodhclient services: - aodh-api diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/aodh/vars/RedHat.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/aodh/vars/RedHat.yml index a0381c6b..3d25bd6c 100644 --- a/deploy/adapters/ansible/openstack_newton_xenial/roles/aodh/vars/RedHat.yml +++ b/deploy/adapters/ansible/openstack_newton_xenial/roles/aodh/vars/RedHat.yml @@ -13,7 +13,7 @@ packages: - openstack-aodh-notifier - openstack-aodh-listener - openstack-aodh-expirer - - python-ceilometerclient + - python-aodhclient services: - openstack-aodh-api diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/nova-compute/templates/nova.conf b/deploy/adapters/ansible/openstack_newton_xenial/roles/nova-compute/templates/nova.conf index 5f8fb887..76728b27 100644 --- a/deploy/adapters/ansible/openstack_newton_xenial/roles/nova-compute/templates/nova.conf +++ b/deploy/adapters/ansible/openstack_newton_xenial/roles/nova-compute/templates/nova.conf @@ -18,7 +18,7 @@ auth_strategy = keystone my_ip = {{ internal_ip }} use_neutron = True firewall_driver = nova.virt.firewall.NoopFirewallDriver -transport_url = rabbit://openstack:{{ RABBIT_PASS }}@{{ rabbit_host }} +transport_url = rabbit://{{ RABBIT_USER }}:{{ RABBIT_PASS }}@{{ rabbit_host }} default_floating_pool={{ public_net_info.network }} metadata_listen={{ internal_ip }} linuxnet_interface_driver = nova.network.linux_net.LinuxOVSInterfaceDriver -- cgit 1.2.3-korg