From 88df88a19674ccc0017836941b8ee32eaadf19fb Mon Sep 17 00:00:00 2001
From: Stuart Mackie <wsmackie@juniper.net>
Date: Thu, 23 Mar 2017 06:19:54 -0700
Subject: Deleted charms with wrong license. Will source them differently in
 future.

Change-Id: I0fc99ea03c6b6ca4701e63793cb2be60e56c7588
Signed-off-by: Stuart Mackie <wsmackie@juniper.net>
---
 .../ceilometer/templates/mitaka/ceilometer.conf    | 42 ----------------------
 1 file changed, 42 deletions(-)
 delete mode 100644 charms/trusty/ceilometer/templates/mitaka/ceilometer.conf

(limited to 'charms/trusty/ceilometer/templates/mitaka')

diff --git a/charms/trusty/ceilometer/templates/mitaka/ceilometer.conf b/charms/trusty/ceilometer/templates/mitaka/ceilometer.conf
deleted file mode 100644
index d026133..0000000
--- a/charms/trusty/ceilometer/templates/mitaka/ceilometer.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-# mitaka
-###############################################################################
-# [ WARNING ]
-# ceilometer configuration file maintained by Juju
-# local changes may be overwritten.
-###############################################################################
-[DEFAULT]
-debug = {{ debug }}
-verbose = {{ verbose }}
-use_syslog = {{ use_syslog }}
-
-[api]
-port = {{ port }}
-workers = {{ api_workers }}
-
-[service_credentials]
-os_auth_url = {{ service_protocol }}://{{ service_host }}:{{ service_port }}/v2.0
-os_tenant_name = {{ admin_tenant_name }}
-os_username = {{ admin_user }}
-os_password = {{ admin_password }}
-
-[database]
-{% if db_replset: -%}
-connection = mongodb://{{ db_mongo_servers }}/{{ db_name }}?readPreference=primaryPreferred&replicaSet={{ db_replset }}
-mongodb_replica_set = {{ db_replset }}
-{% else -%}
-connection = mongodb://{{ db_host }}:{{ db_port }}/{{ db_name }}
-{% endif %}
-
-[publisher]
-telemetry_secret = {{ metering_secret }}
-
-[keystone_authtoken]
-auth_type = password
-auth_uri = {{ service_protocol }}://{{ service_host }}:{{ service_port }}/
-auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/
-project_name = {{ admin_tenant_name }}
-username = {{ admin_user }}
-password = {{ admin_password }}
-signing_dir = {{ signing_dir }}
-
-{% include "section-rabbitmq-oslo" %}
-- 
cgit 1.2.3-korg