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>
---
 .../templates/icehouse/ceilometer.conf             | 33 ----------------------
 .../ceilometer-agent/templates/parts/rabbitmq      | 21 --------------
 2 files changed, 54 deletions(-)
 delete mode 100644 charms/trusty/ceilometer-agent/templates/icehouse/ceilometer.conf
 delete mode 100644 charms/trusty/ceilometer-agent/templates/parts/rabbitmq

(limited to 'charms/trusty/ceilometer-agent/templates')

diff --git a/charms/trusty/ceilometer-agent/templates/icehouse/ceilometer.conf b/charms/trusty/ceilometer-agent/templates/icehouse/ceilometer.conf
deleted file mode 100644
index ed778f0..0000000
--- a/charms/trusty/ceilometer-agent/templates/icehouse/ceilometer.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-# icehouse
-###############################################################################
-# [ WARNING ]
-# ceilometer configuration file maintained by Juju
-# local changes may be overwritten.
-###############################################################################
-[DEFAULT]
-debug = {{ debug }}
-verbose = {{ verbose }}
-logdir = /var/log/ceilometer
-{% include "parts/rabbitmq" %}
-{% if use_internal_endpoints -%}
-interface = internal
-{% endif -%}
-
-{% if auth_host -%}
-[service_credentials]
-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 }}
-{% endif -%}
-
-{% if metering_secret -%}
-[publisher_rpc]
-metering_secret = {{ metering_secret }}
-{% endif -%}
-
-[database]
-# NOTE(jamespage) this allows the db sync process to run OK for upgrades
-# fixed in icehouse
-backend=sqlalchemy
-connection=sqlite:////var/lib/ceilometer/$sqlite_db
diff --git a/charms/trusty/ceilometer-agent/templates/parts/rabbitmq b/charms/trusty/ceilometer-agent/templates/parts/rabbitmq
deleted file mode 100644
index bbd0371..0000000
--- a/charms/trusty/ceilometer-agent/templates/parts/rabbitmq
+++ /dev/null
@@ -1,21 +0,0 @@
-{% if rabbitmq_host or rabbitmq_hosts -%}
-rabbit_userid = {{ rabbitmq_user }}
-rabbit_virtual_host = {{ rabbitmq_virtual_host }}
-rabbit_password = {{ rabbitmq_password }}
-{% if rabbitmq_hosts -%}
-rabbit_hosts = {{ rabbitmq_hosts }}
-{% if rabbitmq_ha_queues -%}
-rabbit_ha_queues = True
-rabbit_durable_queues = False
-{% endif -%}
-{% else -%}
-rabbit_host = {{ rabbitmq_host }}
-{% endif -%}
-{% if rabbit_ssl_port -%}
-rabbit_use_ssl = True
-rabbit_port = {{ rabbit_ssl_port }}
-{% if rabbit_ssl_ca -%}
-kombu_ssl_ca_certs = {{ rabbit_ssl_ca }}
-{% endif -%}
-{% endif -%}
-{% endif -%}
\ No newline at end of file
-- 
cgit 1.2.3-korg