Merge "Stop iptables from being enabled by force"

This commit is contained in:
Zuul 2018-06-29 09:38:33 +00:00 committed by Gerrit Code Review
commit dcff8c5fbb
2 changed files with 16 additions and 0 deletions

View File

@ -0,0 +1,7 @@
#!/bin/sh
# this script is intentionally reduced to an exit call to eliminate the
# automatic invocation of iptables.
# lp: https://bugs.launchpad.net/neutron/+bug/1622914
# bz: https://bugzilla.redhat.com/show_bug.cgi?id=1421022
exit 0

View File

@ -73,6 +73,15 @@ template '/etc/neutron/rootwrap.conf' do
)
end
cookbook_file '/usr/bin/neutron-enable-bridge-firewall.sh' do
source 'neutron-enable-bridge-firewall.sh'
owner 'root'
group 'wheel'
mode '0755'
action :create
only_if { node['platform_family'] == 'redhat' }
end
if node['openstack']['mq']['service_type'] == 'rabbit'
node.default['openstack']['network']['conf_secrets']['DEFAULT']['transport_url'] = rabbit_transport_url 'network'
end