From 95ecdb773c9fa90f9e4f1f792f5cc5dc8328fd6a Mon Sep 17 00:00:00 2001 From: chigang Date: Fri, 30 Jun 2017 20:24:25 +0800 Subject: Remove obsoleted code JIRA:- use OpenStack-ansible deploy openstack, so remove obsoleted code. Some of the enhanced features will be added in later versions Change-Id: Ie92b92b5de234a7d7d03b578b0bc15fd0218b3b3 Signed-off-by: chigang --- .../adapters/ansible/roles/aodh/handlers/main.yml | 20 ------ .../ansible/roles/aodh/tasks/aodh_config.yml | 13 ---- .../ansible/roles/aodh/tasks/aodh_install.yml | 71 ---------------------- deploy/adapters/ansible/roles/aodh/tasks/main.yml | 23 ------- .../ansible/roles/aodh/templates/aodh.conf.j2 | 56 ----------------- .../ansible/roles/aodh/templates/wsgi-aodh.conf.j2 | 28 --------- deploy/adapters/ansible/roles/aodh/vars/Debian.yml | 27 -------- deploy/adapters/ansible/roles/aodh/vars/RedHat.yml | 27 -------- deploy/adapters/ansible/roles/aodh/vars/main.yml | 12 ---- 9 files changed, 277 deletions(-) delete mode 100644 deploy/adapters/ansible/roles/aodh/handlers/main.yml delete mode 100644 deploy/adapters/ansible/roles/aodh/tasks/aodh_config.yml delete mode 100644 deploy/adapters/ansible/roles/aodh/tasks/aodh_install.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/wsgi-aodh.conf.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/roles/aodh') 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 983de9fc..00000000 --- a/deploy/adapters/ansible/roles/aodh/handlers/main.yml +++ /dev/null @@ -1,20 +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) }}" - -- name: aodh reload apache - service: name={{ item }} state=reloaded - with_items: "{{ http_service_name }}" - -- name: aodh restart apache - service: name={{ item }} state=restarted enabled=yes - with_items: "{{ http_service_name }}" diff --git a/deploy/adapters/ansible/roles/aodh/tasks/aodh_config.yml b/deploy/adapters/ansible/roles/aodh/tasks/aodh_config.yml deleted file mode 100644 index e165121f..00000000 --- a/deploy/adapters/ansible/roles/aodh/tasks/aodh_config.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: aodh db sync - shell: su -s /bin/sh -c "aodh-dbsync" aodh - notify: - - restart aodh services diff --git a/deploy/adapters/ansible/roles/aodh/tasks/aodh_install.yml b/deploy/adapters/ansible/roles/aodh/tasks/aodh_install.yml deleted file mode 100644 index 4e2e8655..00000000 --- a/deploy/adapters/ansible/roles/aodh/tasks/aodh_install.yml +++ /dev/null @@ -1,71 +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 - -- name: disable aodh-api service - service: name={{ item }} state=stopped enabled=no - with_items: "{{ api_service }}" - -- name: add listen port - lineinfile: - dest: '{{ apache_config_dir }}/ports.conf' - regexp: "^Listen {{ internal_ip }}:8042" - line: "Listen {{ internal_ip }}:8042" - notify: aodh restart apache - -- name: create WSGIScriptAlias Path - file: - path: /var/www/cgi-bin/aodh - state: directory - mode: 0755 - -- name: copy WSGIScriptAlias file - shell: | - cp {{WSGIScriptAlias_file}} /var/www/cgi-bin/aodh/app; - -- name: update apache2 configs - template: - src: wsgi-aodh.conf.j2 - dest: '{{ apache_config_dir }}/sites-available/aodh.conf' - when: ansible_os_family == 'Debian' - notify: aodh reload apache - -- name: enable aodh server - file: - src: "{{ apache_config_dir }}/sites-available/aodh.conf" - dest: "{{ apache_config_dir }}/sites-enabled/aodh.conf" - state: "link" - when: ansible_os_family == 'Debian' - notify: aodh reload apache - -- name: update apache2 configs - template: - src: wsgi-aodh.conf.j2 - dest: '{{ apache_config_dir }}/aodh.conf' - when: ansible_os_family == 'RedHat' - notify: aodh reload apache 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 9b61915f..00000000 --- a/deploy/adapters/ansible/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/roles/aodh/templates/aodh.conf.j2 b/deploy/adapters/ansible/roles/aodh/templates/aodh.conf.j2 deleted file mode 100644 index d9eb0599..00000000 --- a/deploy/adapters/ansible/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/roles/aodh/templates/wsgi-aodh.conf.j2 b/deploy/adapters/ansible/roles/aodh/templates/wsgi-aodh.conf.j2 deleted file mode 100644 index 8d71075e..00000000 --- a/deploy/adapters/ansible/roles/aodh/templates/wsgi-aodh.conf.j2 +++ /dev/null @@ -1,28 +0,0 @@ -{% set work_threads = (ansible_processor_vcpus + 1) // 2 %} -{% if work_threads > 10 %} -{% set work_threads = 10 %} -{% endif %} - - - WSGIDaemonProcess aodh-api processes=4 threads={{ work_threads }} user=aodh group=aodh display-name=%{GROUP} - WSGIProcessGroup aodh-api - WSGIScriptAlias / /var/www/cgi-bin/aodh/app - WSGIApplicationGroup %{GLOBAL} - = 2.4> - ErrorLogFormat "%{cu}t %M" - - ErrorLog /var/log/{{ http_service_name }}/aodh.log - CustomLog /var/log/{{ http_service_name }}/aodh_access.log combined - - - = 2.4> - Require all granted - - - Order allow,deny - Allow from all - - - - -WSGISocketPrefix /var/run/{{ http_service_name }} 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 edf73641..00000000 --- a/deploy/adapters/ansible/roles/aodh/vars/Debian.yml +++ /dev/null @@ -1,27 +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-notifier - - aodh-evaluator - - aodh-listener - -api_service: aodh-api - -apache_config_dir: /etc/apache2 -http_service_name: apache2 -WSGIScriptAlias_file: /usr/lib/python2.7/dist-packages/aodh/api/app.wsgi 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 dba345fb..00000000 --- a/deploy/adapters/ansible/roles/aodh/vars/RedHat.yml +++ /dev/null @@ -1,27 +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-notifier - - openstack-aodh-evaluator - - openstack-aodh-listener - -api_service: openstack-aodh-api - -apache_config_dir: /etc/httpd/conf.d -http_service_name: httpd -WSGIScriptAlias_file: /usr/lib/python2.7/site-packages/aodh/api/app.wsgi 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: [] -- cgit 1.2.3-korg