From a9da52f24627813dffe278e2299bc66286a00358 Mon Sep 17 00:00:00 2001
From: liyuenan <liyuenan@huawei.com>
Date: Tue, 22 Nov 2016 11:51:53 +0800
Subject: Support ceilometer for Newton

JIRA: COMPASS-491

Change-Id: Iffa7e37e931af4c212fe523e529ee34dd2c14c24
Signed-off-by: liyuenan <liyuenan@huawei.com>
---
 .../roles/ceilometer_controller/vars/Debian.yml    | 18 ++++--------
 .../roles/ceilometer_controller/vars/RedHat.yml    | 34 ++++++++--------------
 .../roles/ceilometer_controller/vars/main.yml      | 11 +++++++
 3 files changed, 28 insertions(+), 35 deletions(-)
 create mode 100644 deploy/adapters/ansible/openstack_newton_xenial/roles/ceilometer_controller/vars/main.yml

(limited to 'deploy/adapters/ansible/openstack_newton_xenial/roles/ceilometer_controller/vars')

diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/ceilometer_controller/vars/Debian.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/ceilometer_controller/vars/Debian.yml
index 2a3c3249..de860533 100644
--- a/deploy/adapters/ansible/openstack_newton_xenial/roles/ceilometer_controller/vars/Debian.yml
+++ b/deploy/adapters/ansible/openstack_newton_xenial/roles/ceilometer_controller/vars/Debian.yml
@@ -12,23 +12,15 @@ ceilometer_packages:
   - ceilometer-collector
   - ceilometer-agent-central
   - ceilometer-agent-notification
-#  - ceilometer-alarm-evaluator
-#  - ceilometer-alarm-notifier
   - python-ceilometerclient
 
 ceilometer_services:
   - ceilometer-agent-central
   - ceilometer-agent-notification
-  - ceilometer-api
   - ceilometer-collector
-#  - ceilometer-alarm-evaluator
-#  - ceilometer-alarm-notifier
 
-ceilometer_configs_templates:
-  - src: ceilometer.j2
-    dest:
-      - /etc/ceilometer/ceilometer.conf
-  - src: glance.j2
-    dest:
-      - /etc/glance/glance-api.conf
-      - /etc/glance/glance-registry.conf
+glance_cinder_services:
+  - glance-registry
+  - glance-api
+  - cinder-api
+  - cinder-scheduler
diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/ceilometer_controller/vars/RedHat.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/ceilometer_controller/vars/RedHat.yml
index 6c5f53ec..de860533 100644
--- a/deploy/adapters/ansible/openstack_newton_xenial/roles/ceilometer_controller/vars/RedHat.yml
+++ b/deploy/adapters/ansible/openstack_newton_xenial/roles/ceilometer_controller/vars/RedHat.yml
@@ -8,29 +8,19 @@
 ##############################################################################
 ---
 ceilometer_packages:
-  - openstack-ceilometer-api
-  - openstack-ceilometer-collector
-  - openstack-ceilometer-central
-  - openstack-ceilometer-notification
-#  - openstack-ceilometer-alarm
+  - ceilometer-api
+  - ceilometer-collector
+  - ceilometer-agent-central
+  - ceilometer-agent-notification
   - python-ceilometerclient
 
 ceilometer_services:
-  - openstack-ceilometer-central
-  - openstack-ceilometer-notification
-  - openstack-ceilometer-api
-  - openstack-ceilometer-collector
-#  - openstack-ceilometer-alarm-evaluator
-#  - openstack-ceilometer-alarm-notifier
+  - ceilometer-agent-central
+  - ceilometer-agent-notification
+  - ceilometer-collector
 
-ceilometer_configs_templates:
-  - src: ceilometer.j2
-    dest:
-      - /etc/ceilometer/ceilometer.conf
-  - src: cinder.j2
-    dest:
-      - /etc/cinder/cinder.conf
-  - src: glance.j2
-    dest:
-      - /etc/glance/glance-api.conf
-      - /etc/glance/glance-registry.conf
+glance_cinder_services:
+  - glance-registry
+  - glance-api
+  - cinder-api
+  - cinder-scheduler
diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/ceilometer_controller/vars/main.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/ceilometer_controller/vars/main.yml
new file mode 100644
index 00000000..209e1e00
--- /dev/null
+++ b/deploy/adapters/ansible/openstack_newton_xenial/roles/ceilometer_controller/vars/main.yml
@@ -0,0 +1,11 @@
+##############################################################################
+# 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
-- 
cgit 1.2.3-korg