From 5f7374c2cf6417db656ac48040435e85f105a59c Mon Sep 17 00:00:00 2001
From: Ryan Beisner <ryan.beisner@canonical.com>
Date: Wed, 1 Jul 2015 17:15:42 +0000
Subject: [PATCH] remove accidental templates/ceilometer.conf.~1~ from rev23
 circa 2013

---
 templates/ceilometer.conf.~1~ | 21 ---------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 templates/ceilometer.conf.~1~

diff --git a/templates/ceilometer.conf.~1~ b/templates/ceilometer.conf.~1~
deleted file mode 100644
index e3bb95a..0000000
--- a/templates/ceilometer.conf.~1~
+++ /dev/null
@@ -1,21 +0,0 @@
-[DEFAULT]
-debug = {{ debug }}
-verbose = {{ verbose }}
-
-metering_secret = {{ metering_secret }}
-
-rabbit_host = {{ rabbitmq_host }}
-rabbit_userid = {{ rabbitmq_user }}
-rabbit_password = {{ rabbitmq_password }}
-rabbit_virtual_host = {{ rabbitmq_virtual_host }}
-
-os_auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/v2.0
-os_tenant_name = {{ admin_tenant_name }}
-os_username = {{ admin_user }}
-os_password = {{ admin_password }}
-
-logdir = /var/log/ceilometer
-
-host = {{ ceilometer_host }}
-
-# from socket import gethostname as get_host_name
\ No newline at end of file