diff options
author | chigang <chigang@huawei.com> | 2017-06-30 20:24:25 +0800 |
---|---|---|
committer | chigang <chigang@huawei.com> | 2017-07-03 21:19:28 +0800 |
commit | 95ecdb773c9fa90f9e4f1f792f5cc5dc8328fd6a (patch) | |
tree | 1b012703eb52f78fe35119a4f9eba98b221f69d9 /deploy/adapters/ansible/roles/ceilometer_controller/tasks | |
parent | d529e77a45c77c10ac6970ca9e733e92e89d138f (diff) |
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 <chigang@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/ceilometer_controller/tasks')
3 files changed, 0 insertions, 147 deletions
diff --git a/deploy/adapters/ansible/roles/ceilometer_controller/tasks/ceilometer_config.yml b/deploy/adapters/ansible/roles/ceilometer_controller/tasks/ceilometer_config.yml deleted file mode 100644 index 0a1b9735..00000000 --- a/deploy/adapters/ansible/roles/ceilometer_controller/tasks/ceilometer_config.yml +++ /dev/null @@ -1,91 +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: assure listen port exist - lineinfile: - dest: '{{ apache_config_dir }}/ports.conf' - regexp: "^Listen {{ internal_ip }}:8777" - line: "Listen {{ internal_ip }}:8777" - notify: restart apache server - -- name: create WSGIScriptAlias Path - file: - path: /var/www/cgi-bin/ceilometer - state: directory - mode: 0755 - -- name: copy WSGIScriptAlias file - shell: | - cp {{WSGIScriptAlias_file}} /var/www/cgi-bin/ceilometer/app; - -- name: update apache2 configs - template: - src: wsgi-ceilometer.conf.j2 - dest: '{{ apache_config_dir }}/sites-available/ceilometer.conf' - when: ansible_os_family == 'Debian' - notify: reload apache server - -- name: enable ceilometer server - file: - src: "{{ apache_config_dir }}/sites-available/ceilometer.conf" - dest: "{{ apache_config_dir }}/sites-enabled/ceilometer.conf" - state: "link" - when: ansible_os_family == 'Debian' - notify: reload apache server - -- name: update apache2 configs - template: - src: wsgi-ceilometer.conf.j2 - dest: '{{ apache_config_dir }}/ceilometer.conf' - when: ansible_os_family == 'RedHat' - notify: reload apache server - -- name: copy glance & cinder configs - template: - src: "{{ item }}" - dest: /opt/os_templates - with_items: - - cinder.conf.j2 - - glance-api.conf.j2 - - glance-registry.conf.j2 - -- name: update configs - shell: crudini --merge {{ item.dest }} < /opt/os_templates/{{ item.src }} - with_items: - - src: cinder.conf.j2 - dest: /etc/cinder/cinder.conf - - src: glance-api.conf.j2 - dest: /etc/glance/glance-api.conf - - src: glance-registry.conf.j2 - dest: /etc/glance/glance-registry.conf - notify: restart glance_cinder service - -- name: delete configs - file: - path: /opt/os_templates/{{ item }} - state: absent - with_items: - - cinder.conf.j2 - - glance-api.conf.j2 - - glance-registry.conf.j2 - -- name: change meter polling interval to 300s - replace: - dest: /etc/ceilometer/pipeline.yaml - regexp: 'interval: .+' - replace: 'interval: 300' - notify: restart ceilometer service - -- name: write services to monitor list - lineinfile: dest=/opt/service create=yes line='{{ item }}' - with_items: "{{ ceilometer_services }}" - -- meta: flush_handlers diff --git a/deploy/adapters/ansible/roles/ceilometer_controller/tasks/ceilometer_install.yml b/deploy/adapters/ansible/roles/ceilometer_controller/tasks/ceilometer_install.yml deleted file mode 100644 index e2414262..00000000 --- a/deploy/adapters/ansible/roles/ceilometer_controller/tasks/ceilometer_install.yml +++ /dev/null @@ -1,34 +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: disable auto start - copy: - content: "#!/bin/sh\nexit 101" - dest: "/usr/sbin/policy-rc.d" - mode: 0755 - when: ansible_os_family == "Debian" - -- name: install ceilometer packages - action: "{{ ansible_pkg_mgr }} name={{ item }} state=present" - with_items: "{{ ceilometer_packages | union(packages_noarch) }}" - -- name: enable auto start - file: - path=/usr/sbin/policy-rc.d - state=absent - when: ansible_os_family == "Debian" - -- name: update ceilometer configs - template: - src: ceilometer.conf.j2 - dest: /etc/ceilometer/ceilometer.conf - backup: "yes" - notify: restart ceilometer service diff --git a/deploy/adapters/ansible/roles/ceilometer_controller/tasks/main.yml b/deploy/adapters/ansible/roles/ceilometer_controller/tasks/main.yml deleted file mode 100644 index 1e3c04d7..00000000 --- a/deploy/adapters/ansible/roles/ceilometer_controller/tasks/main.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 -############################################################################## ---- -- include: ceilometer_install.yml - tags: - - install - - ceilometer_install - - ceilometer - -- include: ceilometer_config.yml - tags: - - config - - ceilometer_config - - ceilometer - -- meta: flush_handlers |