openstack
/
cookbook-openstack-identity
Code Issues Proposed changes

use Array for apache2 listen attributes 

* the apache2 cookbook got patched recently and now uses an array of
  "ipaddress:port" to define where apache2 should listen

Depends-On: I7304932c19398c2bd245bbb7cbad6df4f487047e
Change-Id: Id91fb812ba91dab2803c68d24adaddbe0fde7a5e
This commit is contained in:
Jan Klare 2016-03-02 13:41:26 +01:00 committed by Jens Rosenboom
parent d47ebc4e52
commit 0271eb1711
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
recipes/server-apache.rb
View File

@ -239,13 +239,12 @@ end
#### Start of Apache specific work
apache_listen_public = { public_bind_address => [public_bind_service.port.to_s] }
apache_listen_internal = { internal_bind_address => [internal_bind_service.port.to_s] }
apache_listen_admin = { admin_bind_address => [admin_bind_service.port.to_s] }
apache_listen = Chef::Mixin::DeepMerge.merge(Chef::Mixin::DeepMerge.merge(apache_listen_public, apache_listen_internal), apache_listen_admin)
apache_listen = Array(node['apache']['listen']) # include already defined listen attributes
apache_listen += ["#{public_bind_service.host}:#{public_bind_service.port}"]
apache_listen += ["#{internal_bind_service.host}:#{internal_bind_service.port}"]
apache_listen += ["#{admin_bind_service.host}:#{admin_bind_service.port}"]
node.normal['apache']['listen'] =
Chef::Mixin::DeepMerge.merge(node['apache']['listen'], apache_listen)
node.normal['apache']['listen'] = apache_listen.uniq
include_recipe 'apache2'
include_recipe 'apache2::mod_wsgi'

3
spec/server-apache_spec.rb
View File

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