From b0e2399d83d222449eaaa47a1bd61360e37fd6b0 Mon Sep 17 00:00:00 2001
From: Steve Lewis <stevelle@gmail.com>
Date: Tue, 15 Mar 2016 15:33:25 -0700
Subject: [PATCH] Simplify overrides from example file

---
 defaults/main.yml                             |  2 +-
 .../user_gnocchi_overrides.yml.example        | 21 ------
 ext/patches/gnocchi_support.patch             | 67 -------------------
 3 files changed, 1 insertion(+), 89 deletions(-)
 delete mode 100644 ext/patches/gnocchi_support.patch

diff --git a/defaults/main.yml b/defaults/main.yml
index 2606257..28cb504 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -96,7 +96,7 @@ gnocchi_keystone_auth_plugin: password
 gnocchi_service_region: RegionOne
 gnocchi_service_user_name: gnocchi
 gnocchi_role_name: admin
-gnocchi_service_project_name: service
+gnocchi_service_project_name: "{{ 'service' if gnocchi_storage_driver == 'file' else 'gnocchi_swift' }}"
 gnocchi_service_project_domain_id: default
 gnocchi_service_user_domain_id: default
 gnocchi_service_address: 0.0.0.0
diff --git a/ext/openstack_deploy/user_gnocchi_overrides.yml.example b/ext/openstack_deploy/user_gnocchi_overrides.yml.example
index bfabaa9..36e0e25 100644
--- a/ext/openstack_deploy/user_gnocchi_overrides.yml.example
+++ b/ext/openstack_deploy/user_gnocchi_overrides.yml.example
@@ -79,27 +79,6 @@ ceilometer_ceilometer_conf_overrides:
     filter_service_activity: true
     filter_project: "{{ gnocchi_service_project_name }}"
 
-## Demonstrating expected configs necessary to use swift for storage
-## When using keystone auth v2 some entries will need to be adjusted
-## We need to use a dedicated project for gnocchi when using a Swift backend
-##   in order to identify the traffic related to storing metrics in Swift and
-##   exclude it from the other Swift traffic reported to Gnocchi. See also
-##   filter_service_activity and filter_service_activity in ceilometer.conf
-gnocchi_service_project_name: gnocchi_swift
-gnocchi_service_project_description: Dedicated project for the Gnocchi Service
-gnocchi_conf_overrides:
-  storage:
-    driver: swift
-    swift_auth_version: 3
-    swift_authurl: "{{ keystone_service_internalurl }}"
-    swift_endpoint_type: internalURL
-    swift_user: "{{ gnocchi_service_user_name }}"
-    swift_key: "{{ gnocchi_service_password }}"
-    swift_region_name: "{{ gnocchi_service_region }}"
-    swift_project_domain_id: "{{ gnocchi_service_project_domain_id }}"
-    swift_user_domain_id: "{{ gnocchi_service_user_domain_id }}"
-    swift_tenant_name: "{{ gnocchi_service_project_name }}"
-    swift_container_prefix: gnocchi
 ## Demonstrating the expected configurations necessary to use ceph for storage
 #    driver: ceph
 #    ceph_username: gnocci
diff --git a/ext/patches/gnocchi_support.patch b/ext/patches/gnocchi_support.patch
deleted file mode 100644
index dca45eb..0000000
--- a/ext/patches/gnocchi_support.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 579d613ff4632c37e080ccc8e51a769a41f925e5 Mon Sep 17 00:00:00 2001
-From: Steve Lewis <stevelle@gmail.com>
-Date: Fri, 5 Feb 2016 15:40:53 -0800
-Subject: [PATCH] Add optional support for gnocchi to ceilometer
-
-Change-Id: I3e217105a2f142b7c73b77c3e8d227eb8ccdb3ca
----
- .../os_ceilometer/templates/ceilometer.conf.j2     | 25 +++++++++++++++++++++-
- 1 file changed, 24 insertions(+), 1 deletion(-)
-
-diff --git a/playbooks/roles/os_ceilometer/templates/ceilometer.conf.j2 b/playbooks/roles/os_ceilometer/templates/ceilometer.conf.j2
-index 04a0695..faec8d5 100644
---- a/playbooks/roles/os_ceilometer/templates/ceilometer.conf.j2
-+++ b/playbooks/roles/os_ceilometer/templates/ceilometer.conf.j2
-@@ -6,8 +6,11 @@
- [DEFAULT]
- debug = {{ debug }}
- auth_strategy = keystone
--notification_topics = notifications
- rpc_backend = rabbit
-+{% if groups['gnocchi_all'] is defined %}
-+meter_dispatchers = gnocchi
-+event_dispatchers = ""
-+{% endif %}
- 
- [oslo_policy]
- policy_file = /etc/ceilometer/policy.json
-@@ -21,16 +24,36 @@ rabbit_virtual_host = {{ ceilometer_rabbitmq_vhost }}
- rabbit_hosts = {{ rabbitmq_servers }}
- rabbit_use_ssl = {{ rabbitmq_use_ssl }}
- 
-+[oslo_messaging_notifications]
-+topics = notifications
-+
- [api]
- workers = {{ ceilometer_api_workers | default(workers) }}
- port = 8777
- 
- [collector]
- workers = {{ ceilometer_collector_workers | default(workers) }}
-+{% if groups['gnocchi_all'] is defined %}
-+batch_size = 10
-+batch_timeout = 5
-+
-+[dispatcher_gnocchi]
-+archive_policy = low
-+filter_service_activity = true
-+filter_project = gnocchi_swift
-+
-+[storage]
-+max_retries: 80
-+{% endif %}
- 
- [notification]
- workers = {{ ceilometer_notification_workers | default(workers) }}
-+{% if groups['gnocchi_all'] is defined %}
-+store_events = False
-+{% else %}
- store_events = True
-+{% endif %}
-+
- # Configuring the notification queue listeners
- # Ceilometer needs to connect to it's own rabbitmq vhost
- {% for host in groups['rabbitmq_all'] %}
--- 
-2.6.4
-