opendev
/
puppet-openstack_health
Code Issues Proposed changes

Merge "Fix scope of vhost template variable"

This commit is contained in:
Zuul 2018-07-21 14:47:23 +00:00 committed by Gerrit Code Review
parent 23f6743639 361c38284e
commit 74a97f49ec
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
templates/openstack-health-frontend.vhost.erb
View File

@ -1,9 +1,9 @@
<% unless [443, 80].include?(@vhost_port.to_i) %>
Listen <%= @vhost_port %>
<% unless [443, 80].include?(scope.lookupvar("::openstack_health::vhost::vhost_port").to_i) %>
Listen <%= scope.lookupvar("::openstack_health::vhost::vhost_port") %>
<% end %>
<VirtualHost *:<%= @vhost_port %>>
ServerName <%= @vhost_name %>
ServerAdmin <%= @serveradmin %>
<VirtualHost *:<%= scope.lookupvar("::openstack_health::vhost::vhost_port") %>>
ServerName <%= scope.lookupvar("::openstack_health::vhost::vhost_name") %>
ServerAdmin <%= scope.lookupvar("::openstack_health::vhost::serveradmin") %>
LogLevel info
CustomLog ${APACHE_LOG_DIR}/openstack-health-frontend-access.log combined