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 --- .../tasks/ceilometer_config.yml | 71 ---------------------- .../tasks/ceilometer_install.yml | 35 ----------- .../roles/ceilometer_controller/tasks/main.yml | 22 ------- 3 files changed, 128 deletions(-) delete mode 100644 deploy/adapters/ansible/openstack_newton_xenial/roles/ceilometer_controller/tasks/ceilometer_config.yml delete mode 100644 deploy/adapters/ansible/openstack_newton_xenial/roles/ceilometer_controller/tasks/ceilometer_install.yml delete mode 100644 deploy/adapters/ansible/openstack_newton_xenial/roles/ceilometer_controller/tasks/main.yml (limited to 'deploy/adapters/ansible/openstack_newton_xenial/roles/ceilometer_controller/tasks') diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/ceilometer_controller/tasks/ceilometer_config.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/ceilometer_controller/tasks/ceilometer_config.yml deleted file mode 100644 index 7f5209c1..00000000 --- a/deploy/adapters/ansible/openstack_newton_xenial/roles/ceilometer_controller/tasks/ceilometer_config.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: update apache2 configs - template: - src: wsgi-ceilometer.conf.j2 - dest: /etc/apache2/sites-available/ceilometer.conf - notify: reload apache server - -- name: enable ceilometer server - file: - src: /etc/apache2/sites-available/ceilometer.conf - dest: /etc/apache2/sites-enabled/ceilometer.conf - state: "link" - when: ansible_os_family == 'Debian' - notify: reload apache server - -- name: assure listen port exist - shell: echo "Listen {{ internal_ip }}:8777" >> /etc/apache2/ports.conf - notify: - - restart 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/openstack_newton_xenial/roles/ceilometer_controller/tasks/ceilometer_install.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/ceilometer_controller/tasks/ceilometer_install.yml deleted file mode 100644 index 0f2ba3d2..00000000 --- a/deploy/adapters/ansible/openstack_newton_xenial/roles/ceilometer_controller/tasks/ceilometer_install.yml +++ /dev/null @@ -1,35 +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/openstack_newton_xenial/roles/ceilometer_controller/tasks/main.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/ceilometer_controller/tasks/main.yml deleted file mode 100644 index 1e3c04d7..00000000 --- a/deploy/adapters/ansible/openstack_newton_xenial/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 -- cgit 1.2.3-korg