From: Thomas Herve <therve@redhat.com>
Date: Tue, 25 Apr 2017 10:01:56 +0000 (+0200)
Subject: Pass httpd service_name to Zaqar
X-Git-Tag: opnfv-6.0.0~724^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=8d1f390501138a76f1acdf7cb82b70dadaffa623;hp=386ac7791b1ed53445c059ec2b7b9f1a00222a37;p=apex-tripleo-heat-templates.git

Pass httpd service_name to Zaqar

This removes the need to do it in puppet-tripleo

Change-Id: I6f44a6a02041c0fbbafb770a087a0032c3a53a76
---

diff --git a/puppet/services/zaqar.yaml b/puppet/services/zaqar.yaml
index 06965c8c..1ab793f0 100644
--- a/puppet/services/zaqar.yaml
+++ b/puppet/services/zaqar.yaml
@@ -71,6 +71,7 @@ outputs:
             zaqar::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
             zaqar::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]}
             zaqar::debug: {get_param: Debug}
+            zaqar::server::service_name: 'httpd'
             zaqar::transport::websocket::bind: {get_param: [EndpointMap, ZaqarInternal, host]}
             zaqar::wsgi::apache::ssl: false
             zaqar::wsgi::apache::bind_host: {get_param: [ServiceNetMap, ZaqarApiNetwork]}