aboutsummaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/roles/ceilometer_compute
diff options
context:
space:
mode:
authorchigang <chigang@huawei.com>2017-06-30 20:24:25 +0800
committerchigang <chigang@huawei.com>2017-07-03 21:19:28 +0800
commit95ecdb773c9fa90f9e4f1f792f5cc5dc8328fd6a (patch)
tree1b012703eb52f78fe35119a4f9eba98b221f69d9 /deploy/adapters/ansible/roles/ceilometer_compute
parentd529e77a45c77c10ac6970ca9e733e92e89d138f (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_compute')
-rw-r--r--deploy/adapters/ansible/roles/ceilometer_compute/handlers/main.yml16
-rw-r--r--deploy/adapters/ansible/roles/ceilometer_compute/tasks/ceilometer_config.yml36
-rw-r--r--deploy/adapters/ansible/roles/ceilometer_compute/tasks/ceilometer_install.yml34
-rw-r--r--deploy/adapters/ansible/roles/ceilometer_compute/tasks/main.yml22
-rw-r--r--deploy/adapters/ansible/roles/ceilometer_compute/templates/ceilometer.conf.j238
-rw-r--r--deploy/adapters/ansible/roles/ceilometer_compute/templates/nova.conf.j27
-rw-r--r--deploy/adapters/ansible/roles/ceilometer_compute/vars/Debian.yml17
-rw-r--r--deploy/adapters/ansible/roles/ceilometer_compute/vars/RedHat.yml20
-rw-r--r--deploy/adapters/ansible/roles/ceilometer_compute/vars/main.yml11
9 files changed, 0 insertions, 201 deletions
diff --git a/deploy/adapters/ansible/roles/ceilometer_compute/handlers/main.yml b/deploy/adapters/ansible/roles/ceilometer_compute/handlers/main.yml
deleted file mode 100644
index 78178130..00000000
--- a/deploy/adapters/ansible/roles/ceilometer_compute/handlers/main.yml
+++ /dev/null
@@ -1,16 +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 ceilometer service
- service: name={{ item }} state=restarted enabled=yes
- with_items: "{{ ceilometer_services }}"
-
-- name: restart nova service
- service: name={{ item }} state=restarted enabled=yes
- with_items: "{{ nova_services }}"
diff --git a/deploy/adapters/ansible/roles/ceilometer_compute/tasks/ceilometer_config.yml b/deploy/adapters/ansible/roles/ceilometer_compute/tasks/ceilometer_config.yml
deleted file mode 100644
index a5a78281..00000000
--- a/deploy/adapters/ansible/roles/ceilometer_compute/tasks/ceilometer_config.yml
+++ /dev/null
@@ -1,36 +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: copy configs
- template:
- src: "{{ item }}"
- dest: /opt/os_templates
- with_items:
- - ceilometer.conf.j2
- - nova.conf.j2
-
-- name: update ceilometer configs
- shell: crudini --merge {{ item.dest }} < /opt/os_templates/{{ item.src }}
- with_items:
- - src: nova.conf.j2
- dest: /etc/nova/nova.conf
- notify: restart nova service
-
-- name: delete config
- file:
- path: /opt/os_templates/nova.conf.j2
- state: absent
-
-- 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_compute/tasks/ceilometer_install.yml b/deploy/adapters/ansible/roles/ceilometer_compute/tasks/ceilometer_install.yml
deleted file mode 100644
index e2414262..00000000
--- a/deploy/adapters/ansible/roles/ceilometer_compute/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_compute/tasks/main.yml b/deploy/adapters/ansible/roles/ceilometer_compute/tasks/main.yml
deleted file mode 100644
index 1e3c04d7..00000000
--- a/deploy/adapters/ansible/roles/ceilometer_compute/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
diff --git a/deploy/adapters/ansible/roles/ceilometer_compute/templates/ceilometer.conf.j2 b/deploy/adapters/ansible/roles/ceilometer_compute/templates/ceilometer.conf.j2
deleted file mode 100644
index bffd6068..00000000
--- a/deploy/adapters/ansible/roles/ceilometer_compute/templates/ceilometer.conf.j2
+++ /dev/null
@@ -1,38 +0,0 @@
-[DEFAULT]
-verbose = True
-rpc_backend = rabbit
-auth_strategy = keystone
-
-[publisher]
-metering_secret = {{ metering_secret }}
-
-[keystone_authtoken]
-auth_uri = http://{{ internal_vip.ip }}:5000
-auth_url = http://{{ internal_vip.ip }}:35357
-auth_type = password
-project_domain_name = default
-user_domain_name = default
-project_name = service
-username = ceilometer
-password = {{ CEILOMETER_PASS }}
-
-auth_plugin = password
-project_domain_id = default
-user_domain_id = default
-
-[oslo_messaging_rabbit]
-rabbit_host = {{ rabbit_host }}
-rabbit_userid = {{ RABBIT_USER }}
-rabbit_password = {{ RABBIT_PASS }}
-
-[service_credentials]
-auth_url = http://{{ internal_vip.ip }}:5000
-project_domain_id = default
-user_domain_id = default
-auth_type = password
-username = ceilometer
-project_name = service
-password = {{ CEILOMETER_PASS }}
-interface = internalURL
-region_name = RegionOne
-
diff --git a/deploy/adapters/ansible/roles/ceilometer_compute/templates/nova.conf.j2 b/deploy/adapters/ansible/roles/ceilometer_compute/templates/nova.conf.j2
deleted file mode 100644
index 68ffdc0a..00000000
--- a/deploy/adapters/ansible/roles/ceilometer_compute/templates/nova.conf.j2
+++ /dev/null
@@ -1,7 +0,0 @@
-[DEFAULT]
-instance_usage_audit = True
-instance_usage_audit_period = hour
-notify_on_state_change = vm_and_task_state
-
-[oslo_messaging_notifications]
-driver = messagingv2
diff --git a/deploy/adapters/ansible/roles/ceilometer_compute/vars/Debian.yml b/deploy/adapters/ansible/roles/ceilometer_compute/vars/Debian.yml
deleted file mode 100644
index 1bf3956f..00000000
--- a/deploy/adapters/ansible/roles/ceilometer_compute/vars/Debian.yml
+++ /dev/null
@@ -1,17 +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
-##############################################################################
----
-ceilometer_packages:
- - ceilometer-agent-compute
-
-ceilometer_services:
- - ceilometer-agent-compute
-
-nova_services:
- - nova-compute
diff --git a/deploy/adapters/ansible/roles/ceilometer_compute/vars/RedHat.yml b/deploy/adapters/ansible/roles/ceilometer_compute/vars/RedHat.yml
deleted file mode 100644
index f3d5f0e1..00000000
--- a/deploy/adapters/ansible/roles/ceilometer_compute/vars/RedHat.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
-##############################################################################
----
-ceilometer_packages:
- - openstack-ceilometer-compute
- - python-ceilometerclient
- - python-pecan
-
-ceilometer_services:
- - openstack-ceilometer-compute
- - openstack-nova-compute
-
-nova_services:
- - openstack-nova-compute
diff --git a/deploy/adapters/ansible/roles/ceilometer_compute/vars/main.yml b/deploy/adapters/ansible/roles/ceilometer_compute/vars/main.yml
deleted file mode 100644
index 209e1e00..00000000
--- a/deploy/adapters/ansible/roles/ceilometer_compute/vars/main.yml
+++ /dev/null
@@ -1,11 +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: []
-metering_secret: 1c5df72079b31fb47747