From 88df88a19674ccc0017836941b8ee32eaadf19fb Mon Sep 17 00:00:00 2001 From: Stuart Mackie 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 --- .../ceilometer/templates/icehouse/ceilometer.conf | 42 --------------------- .../ceilometer/templates/kilo/ceilometer.conf | 43 ---------------------- .../ceilometer/templates/mitaka/ceilometer.conf | 42 --------------------- charms/trusty/ceilometer/templates/parts/rabbitmq | 21 ----------- 4 files changed, 148 deletions(-) delete mode 100644 charms/trusty/ceilometer/templates/icehouse/ceilometer.conf delete mode 100644 charms/trusty/ceilometer/templates/kilo/ceilometer.conf delete mode 100644 charms/trusty/ceilometer/templates/mitaka/ceilometer.conf delete mode 100644 charms/trusty/ceilometer/templates/parts/rabbitmq (limited to 'charms/trusty/ceilometer/templates') diff --git a/charms/trusty/ceilometer/templates/icehouse/ceilometer.conf b/charms/trusty/ceilometer/templates/icehouse/ceilometer.conf deleted file mode 100644 index 4b6b6d1..0000000 --- a/charms/trusty/ceilometer/templates/icehouse/ceilometer.conf +++ /dev/null @@ -1,42 +0,0 @@ -# icehouse -############################################################################### -# [ 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] -{% 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_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 }} -signing_dir = {{ signing_dir }} diff --git a/charms/trusty/ceilometer/templates/kilo/ceilometer.conf b/charms/trusty/ceilometer/templates/kilo/ceilometer.conf deleted file mode 100644 index da44948..0000000 --- a/charms/trusty/ceilometer/templates/kilo/ceilometer.conf +++ /dev/null @@ -1,43 +0,0 @@ -# kilo -############################################################################### -# [ WARNING ] -# ceilometer configuration file maintained by Juju -# local changes may be overwritten. -############################################################################### -[DEFAULT] -debug = {{ debug }} -verbose = {{ verbose }} -use_syslog = {{ use_syslog }} -api_workers = {{ api_workers }} - -{% 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] -{% 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_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 }} -signing_dir = {{ signing_dir }} 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" %} diff --git a/charms/trusty/ceilometer/templates/parts/rabbitmq b/charms/trusty/ceilometer/templates/parts/rabbitmq deleted file mode 100644 index bbd0371..0000000 --- a/charms/trusty/ceilometer/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