Remove default apache port
The default apache port overlaps with horizon, but uses a different address syntax, *:80 vs 0.0.0.0:80. This causes apache2 to sometimes fail on startup with Address already in use: AH00072: make_sock: could not bind to address [::]:80 Change-Id: Ib45393b0244dd4cffb440c84c614ba9a104df105
This commit is contained in:
parent
dbea65b625
commit
27c46d6450
|
@ -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}"]
|
||||
|
||||
|
|
|
@ -363,7 +363,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
|
||||
|
||||
|
|
Loading…
Reference in New Issue