From: Bogdan Dobrelya <bdobreli@redhat.com>
Date: Thu, 27 Apr 2017 10:11:12 +0000 (+0200)
Subject: Disable default vhost for apache
X-Git-Tag: opnfv-6.0.0~720^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=23201d93a1518801510ee151e769680a3c7e2e30;p=apex-tripleo-heat-templates.git

Disable default vhost for apache

It is required for a hybrid deployments
when WSGI based services running both at host and in containers, without conflicting default ports.

Partial-bug: #1686637
Co-authored-by: Juan Antonio Osorio Robles <jaosorior@redhat.com>

Change-Id: I9d0a5bb32337a6a8f1a4036f9560df79dfe1d90a
Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
---

diff --git a/puppet/services/apache.yaml b/puppet/services/apache.yaml
index 6e53b1f7..68d44767 100644
--- a/puppet/services/apache.yaml
+++ b/puppet/services/apache.yaml
@@ -64,6 +64,7 @@ outputs:
             # internal_api_uri -> [IP]
             # internal_api_subnet - > IP/CIDR
             apache::ip: {get_param: [ServiceNetMap, ApacheNetwork]}
+            apache::default_vhost: false
             apache::server_signature: 'Off'
             apache::server_tokens: 'Prod'
             apache_remote_proxy_ips_network:
diff --git a/releasenotes/notes/disable_default_apache_vhost-f41d11fe07605f7f.yaml b/releasenotes/notes/disable_default_apache_vhost-f41d11fe07605f7f.yaml
new file mode 100644
index 00000000..279e25cc
--- /dev/null
+++ b/releasenotes/notes/disable_default_apache_vhost-f41d11fe07605f7f.yaml
@@ -0,0 +1,6 @@
+---
+upgrade:
+  - |
+    Disable default vhost for apache. It is required for a hybrid deployments
+    when WSGI based services running both at host and in containers, without
+    conflicting default ports.