From 98d931fb7f3f281470ff62abf5aa467a3d79edf0 Mon Sep 17 00:00:00 2001 From: James Page Date: Fri, 4 Mar 2016 11:52:44 +0000 Subject: [PATCH] Remove templates for unsupported releases Grizzly and Havana have been unsupported for some time; remove templates as they are no longer tested or required. Change-Id: I97377182fe28e3f7aa98784b537e1a353a58280d --- templates/grizzly/ceilometer.conf | 26 -------------------------- templates/havana/ceilometer.conf | 31 ------------------------------- 2 files changed, 57 deletions(-) delete mode 100644 templates/grizzly/ceilometer.conf delete mode 100644 templates/havana/ceilometer.conf diff --git a/templates/grizzly/ceilometer.conf b/templates/grizzly/ceilometer.conf deleted file mode 100644 index b082152..0000000 --- a/templates/grizzly/ceilometer.conf +++ /dev/null @@ -1,26 +0,0 @@ -# grizzly -############################################################################### -# [ WARNING ] -# ceilometer configuration file maintained by Juju -# local changes may be overwritten. -############################################################################### -[DEFAULT] -debug = {{ debug }} -verbose = {{ verbose }} -use_syslog = {{ use_syslog }} -metering_secret = {{ metering_secret }} -metering_api_port = {{ port }} -{% include "parts/rabbitmq" %} -database_connection = mongodb://{{ db_host }}:{{ db_port }}/{{ db_name }} -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 -[keystone_authtoken] -auth_host = {{ auth_host }} -auth_port = {{ auth_port }} -auth_protocol = {{ auth_protocol }} -admin_tenant_name = {{ admin_tenant_name }} -admin_user = {{ admin_user }} -admin_password = {{ admin_password }} diff --git a/templates/havana/ceilometer.conf b/templates/havana/ceilometer.conf deleted file mode 100644 index e10e551..0000000 --- a/templates/havana/ceilometer.conf +++ /dev/null @@ -1,31 +0,0 @@ -# havana -############################################################################### -# [ WARNING ] -# ceilometer configuration file maintained by Juju -# local changes may be overwritten. -############################################################################### -[DEFAULT] -debug = {{ debug }} -verbose = {{ verbose }} -use_syslog = {{ use_syslog }} -{% include "parts/rabbitmq" %} -[api] -port = {{ port }} -[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] -connection = mongodb://{{ db_host }}:{{ db_port }}/{{ db_name }} -[publisher_rpc] -metering_secret = {{ metering_secret }} -[keystone_authtoken] -auth_uri = {{ service_protocol }}://{{ service_host }}:{{ service_port }}/ -auth_host = {{ auth_host }} -auth_port = {{ auth_port }} -auth_protocol = {{ auth_protocol }} -admin_tenant_name = {{ admin_tenant_name }} -admin_user = {{ admin_user }} -admin_password = {{ admin_password }} -