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 --- .../adapters/ansible/roles/ceilometer_compute/vars/Debian.yml | 10 ++-------- .../adapters/ansible/roles/ceilometer_compute/vars/RedHat.yml | 10 +--------- 2 files changed, 3 insertions(+), 17 deletions(-) (limited to 'deploy/adapters/ansible/roles/ceilometer_compute/vars') diff --git a/deploy/adapters/ansible/roles/ceilometer_compute/vars/Debian.yml b/deploy/adapters/ansible/roles/ceilometer_compute/vars/Debian.yml index 550d14f5..1bf3956f 100644 --- a/deploy/adapters/ansible/roles/ceilometer_compute/vars/Debian.yml +++ b/deploy/adapters/ansible/roles/ceilometer_compute/vars/Debian.yml @@ -12,12 +12,6 @@ ceilometer_packages: ceilometer_services: - ceilometer-agent-compute - - nova-compute -ceilometer_configs_templates: - - src: ceilometer.j2 - dest: - - /etc/ceilometer/ceilometer.conf - - src: nova.j2 - dest: - - /etc/nova/nova.conf +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 index 5a9128cd..c5778a49 100644 --- a/deploy/adapters/ansible/roles/ceilometer_compute/vars/RedHat.yml +++ b/deploy/adapters/ansible/roles/ceilometer_compute/vars/RedHat.yml @@ -14,12 +14,4 @@ ceilometer_packages: ceilometer_services: - openstack-ceilometer-compute - - openstack-nova-compute - -ceilometer_configs_templates: - - src: ceilometer.j2 - dest: - - /etc/ceilometer/ceilometer.conf - - src: nova.j2 - dest: - - /etc/nova/nova.conf + - openstack-nova-compute -- cgit 1.2.3-korg