openstack
/
cookbook-openstack-identity
Code Issues Proposed changes

Merge "Remove default apache port"

This commit is contained in:
Jenkins 2016-04-11 07:47:43 +00:00 committed by Gerrit Code Review
parent d8a54c8e56 27c46d6450
commit 24757760b3
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
recipes/server-apache.rb
View File

@ -238,6 +238,10 @@ end
#### Start of Apache specific work
apache_listen = Array(node['apache']['listen']) # include already defined listen attributes
# Remove the default apache2 cookbook port, as that is also the default for horizon, but with
# a different address syntax. *:80 vs 0.0.0.0:80
apache_listen -= ['*:80']
apache_listen += ["#{main_bind_address}:#{main_bind_service.port}"]
apache_listen += ["#{admin_bind_address}:#{admin_bind_service.port}"]

2
spec/server-apache_spec.rb
View File

@ -354,7 +354,7 @@ describe 'openstack-identity::server-apache' do
it 'set apache addresses and ports' do
expect(chef_run.node['apache']['listen']).to eq(
%w(*:80 127.0.0.1:5000 127.0.0.1:35357)
%w(127.0.0.1:5000 127.0.0.1:35357)
)
end