From: Pradeep Kilambi <pkilambi@redhat.com>
Date: Mon, 8 Aug 2016 15:21:58 +0000 (-0400)
Subject: Move ceilometer api to run under apache wsgi
X-Git-Tag: opnfv-6.0.0~1697^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=241b88c6130486b775b10d4ce786f2cebfbc37a3;p=apex-tripleo-heat-templates.git

Move ceilometer api to run under apache wsgi

Depends-On: If3feb859b527d08e10c124b5ad2f7f4b1f19156a

Change-Id: I728d0980f7742aa390f11a0f0b8598d1299e2886
---

diff --git a/puppet/services/ceilometer-api.yaml b/puppet/services/ceilometer-api.yaml
index 85b9aacc..201a2b7b 100644
--- a/puppet/services/ceilometer-api.yaml
+++ b/puppet/services/ceilometer-api.yaml
@@ -47,6 +47,9 @@ outputs:
             # internal_api -> IP
             # internal_api_uri -> [IP]
             # internal_api_subnet - > IP/CIDR
+          - ceilometer::api::service_name: 'httpd'
             ceilometer::api::host: {get_param: [ServiceNetMap, CeilometerApiNetwork]}
+            ceilometer::wsgi::apache::bind_host: {get_param: [ServiceNetMap, CeilometerApiNetwork]}
+            ceilometer::wsgi::apache::ssl: false
       step_config: |
         include ::tripleo::profile::base::ceilometer::api