From 819912d0379f6cd2b2693c2968576f7514a117c5 Mon Sep 17 00:00:00 2001 From: liyuenan Date: Mon, 19 Dec 2016 11:06:36 +0800 Subject: master only support newton JIRA: COMPASS-513 Remove other roles and ppa, master only support newton. Change-Id: I47ddb16baa25902c3e05cc7f9d0d6430f5dc7e00 Signed-off-by: liyuenan --- .../roles/aodh/handlers/main.yml | 13 ----- .../roles/aodh/tasks/aodh_config.yml | 14 ------ .../roles/aodh/tasks/aodh_install.yml | 28 ----------- .../roles/aodh/tasks/main.yml | 23 --------- .../roles/aodh/templates/aodh.conf.j2 | 56 ---------------------- .../roles/aodh/vars/Debian.yml | 22 --------- .../roles/aodh/vars/RedHat.yml | 22 --------- .../roles/aodh/vars/main.yml | 12 ----- 8 files changed, 190 deletions(-) delete mode 100644 deploy/adapters/ansible/openstack_newton_xenial/roles/aodh/handlers/main.yml delete mode 100644 deploy/adapters/ansible/openstack_newton_xenial/roles/aodh/tasks/aodh_config.yml delete mode 100644 deploy/adapters/ansible/openstack_newton_xenial/roles/aodh/tasks/aodh_install.yml delete mode 100644 deploy/adapters/ansible/openstack_newton_xenial/roles/aodh/tasks/main.yml delete mode 100644 deploy/adapters/ansible/openstack_newton_xenial/roles/aodh/templates/aodh.conf.j2 delete mode 100644 deploy/adapters/ansible/openstack_newton_xenial/roles/aodh/vars/Debian.yml delete mode 100644 deploy/adapters/ansible/openstack_newton_xenial/roles/aodh/vars/RedHat.yml delete mode 100644 deploy/adapters/ansible/openstack_newton_xenial/roles/aodh/vars/main.yml (limited to 'deploy/adapters/ansible/openstack_newton_xenial/roles/aodh') diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/aodh/handlers/main.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/aodh/handlers/main.yml deleted file mode 100644 index b3399e0c..00000000 --- a/deploy/adapters/ansible/openstack_newton_xenial/roles/aodh/handlers/main.yml +++ /dev/null @@ -1,13 +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 | union(services_noarch) - diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/aodh/tasks/aodh_config.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/aodh/tasks/aodh_config.yml deleted file mode 100644 index e60d5338..00000000 --- a/deploy/adapters/ansible/openstack_newton_xenial/roles/aodh/tasks/aodh_config.yml +++ /dev/null @@ -1,14 +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: aodh db sync - shell: su -s /bin/sh -c "aodh-dbsync" aodh - notify: - - restart aodh services - 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 deleted file mode 100644 index d8a82270..00000000 --- a/deploy/adapters/ansible/openstack_newton_xenial/roles/aodh/tasks/aodh_install.yml +++ /dev/null @@ -1,28 +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/aodh.conf backup=yes - with_items: - - aodh.conf.j2 - notify: - - restart aodh services - -- name: write services to monitor list - lineinfile: dest=/opt/service create=yes line='{{ item }}' - with_items: services | union(services_noarch) - -- name: remove default sqlite db - shell: rm /var/lib/aodh/aodh.sqlite || touch aodh.sqllite.db.removed diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/aodh/tasks/main.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/aodh/tasks/main.yml deleted file mode 100644 index 9b61915f..00000000 --- a/deploy/adapters/ansible/openstack_newton_xenial/roles/aodh/tasks/main.yml +++ /dev/null @@ -1,23 +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: aodh_install.yml - tags: - - install - - aodh_install - - aodh - -- include: aodh_config.yml - when: inventory_hostname == groups['controller'][0] - tags: - - config - - aodh_config - - aodh - -- meta: flush_handlers 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 deleted file mode 100644 index d9eb0599..00000000 --- a/deploy/adapters/ansible/openstack_newton_xenial/roles/aodh/templates/aodh.conf.j2 +++ /dev/null @@ -1,56 +0,0 @@ -{% set memcached_servers = [] %} -{% for host in haproxy_hosts.values() %} -{% set _ = memcached_servers.append('%s:11211'% host) %} -{% endfor %} -{% 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 -auth_strategy = keystone -debug = True - -[api] -host = {{ internal_ip }} - -[database] -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 -token_cache_time = 300 -revocation_cache_time = 60 - -[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 -user_domain_name = default -project_name = service -username = aodh -password = {{ AODH_PASS }} -interface = internalURL -region_name = RegionOne - -endpoint_type = internalURL 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 deleted file mode 100644 index 9bf4ad7a..00000000 --- a/deploy/adapters/ansible/openstack_newton_xenial/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-aodhclient - -services: - - aodh-api - - aodh-notifier - - aodh-evaluator - - aodh-listener 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 deleted file mode 100644 index 3d25bd6c..00000000 --- a/deploy/adapters/ansible/openstack_newton_xenial/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-aodhclient - -services: - - openstack-aodh-api - - openstack-aodh-notifier - - openstack-aodh-evaluator - - openstack-aodh-listener diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/aodh/vars/main.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/aodh/vars/main.yml deleted file mode 100644 index b17f6ed0..00000000 --- a/deploy/adapters/ansible/openstack_newton_xenial/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: [] -- cgit 1.2.3-korg