From 420cd1d60d380878d2683cebd07610976ba8dd6e Mon Sep 17 00:00:00 2001
From: Pradeep Kilambi <pkilambi@redhat.com>
Date: Wed, 12 Oct 2016 09:56:52 -0400
Subject: [PATCH] Run ceilometer api under wsgi on undercloud

When we have enable telemetry true we currently run api as
eventlet process. This is fine for small use cases, but it
would be useful to migrate to wsgi to be consistent with
overcloud.

Change-Id: Ib0fe36fe6cef4afefd7ab63f64922b6943fe90ab
(cherry picked from commit 7c24207563085620c4fef32eab76cec56e9c98cb)
---
 elements/puppet-stack-config/puppet-stack-config.pp            | 1 +
 elements/puppet-stack-config/puppet-stack-config.yaml.template | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/elements/puppet-stack-config/puppet-stack-config.pp b/elements/puppet-stack-config/puppet-stack-config.pp
index 67766ad07..ce74d5f96 100644
--- a/elements/puppet-stack-config/puppet-stack-config.pp
+++ b/elements/puppet-stack-config/puppet-stack-config.pp
@@ -175,6 +175,7 @@ if str2bool(hiera('enable_telemetry', false)) {
   include ::aodh::keystone::auth
   include ::ceilometer
   include ::ceilometer::api
+  include ::ceilometer::wsgi::apache
   include ::ceilometer::db
   include ::ceilometer::agent::notification
   include ::ceilometer::agent::central
diff --git a/elements/puppet-stack-config/puppet-stack-config.yaml.template b/elements/puppet-stack-config/puppet-stack-config.yaml.template
index 663fb21e1..0112dd4ba 100644
--- a/elements/puppet-stack-config/puppet-stack-config.yaml.template
+++ b/elements/puppet-stack-config/puppet-stack-config.yaml.template
@@ -248,6 +248,9 @@ ceilometer::rabbit_userid: {{UNDERCLOUD_RABBIT_USERNAME}}
 ceilometer::rabbit_password: {{UNDERCLOUD_RABBIT_PASSWORD}}
 ceilometer::rabbit_host: {{LOCAL_IP}}
 ceilometer::api::host: {{LOCAL_IP}}
+ceilometer::api::service_name: 'httpd'
+ceilometer::wsgi::apache::ssl: false
+ceilometer::wsgi::apache::bind_host: {{LOCAL_IP}}
 ceilometer::keystone::authtoken::password: {{UNDERCLOUD_CEILOMETER_PASSWORD}}
 ceilometer::keystone::authtoken::auth_uri: "%{hiera('keystone_auth_uri')}"
 ceilometer::keystone::authtoken::auth_url: "%{hiera('keystone_identity_uri')}"