From 95ecdb773c9fa90f9e4f1f792f5cc5dc8328fd6a Mon Sep 17 00:00:00 2001
From: chigang <chigang@huawei.com>
Date: Fri, 30 Jun 2017 20:24:25 +0800
Subject: 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>
---
 .../templates/ceilometer.conf.j2                   | 38 ----------------------
 .../ceilometer_compute/templates/nova.conf.j2      |  7 ----
 2 files changed, 45 deletions(-)
 delete mode 100644 deploy/adapters/ansible/roles/ceilometer_compute/templates/ceilometer.conf.j2
 delete mode 100644 deploy/adapters/ansible/roles/ceilometer_compute/templates/nova.conf.j2

(limited to 'deploy/adapters/ansible/roles/ceilometer_compute/templates')

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
-- 
cgit 1.2.3-korg