diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-04-27 20:21:28 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-04-27 20:21:28 +0000 |
| commit | 25d052833c259c86b4ec810576a6cb6b3deea97c (patch) | |
| tree | 1646a2b2462206554c02f1d1438fda9f7150ff87 | |
| parent | 1b8774331a3d50b8f49b99d3bdef9e1efcba6ea1 (diff) | |
| parent | 23201d93a1518801510ee151e769680a3c7e2e30 (diff) | |
Merge "Disable default vhost for apache"
| -rw-r--r-- | puppet/services/apache.yaml | 1 | ||||
| -rw-r--r-- | releasenotes/notes/disable_default_apache_vhost-f41d11fe07605f7f.yaml | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/puppet/services/apache.yaml b/puppet/services/apache.yaml index d35e1bae..a2c3c7af 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. |