Conditionally set OVS agent firewall driver
Using an empty string to allow the default value in the puppet module no longer seems to work, resulting in the OVS agent configuration having an empty firewall driver configuration. This patch uses a heat template condition to set the hieradata only if something other than an empty string has been set. Change-Id: Ifef9ded1dbb719e75997474bf5ada909dbf40599 Related-Bug: #1656939
This commit is contained in:
parent
6ab1c9289d
commit
18e6dc96e5
|
@ -70,6 +70,9 @@ parameters:
|
||||||
tag: openstack.neutron.agent.openvswitch
|
tag: openstack.neutron.agent.openvswitch
|
||||||
path: /var/log/neutron/openvswitch-agent.log
|
path: /var/log/neutron/openvswitch-agent.log
|
||||||
|
|
||||||
|
conditions:
|
||||||
|
no_firewall_driver: {equals : [{get_param: NeutronOVSFirewallDriver}, '']}
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
|
|
||||||
NeutronBase:
|
NeutronBase:
|
||||||
|
@ -104,13 +107,17 @@ outputs:
|
||||||
# internal_api_uri -> [IP]
|
# internal_api_uri -> [IP]
|
||||||
# internal_api_subnet - > IP/CIDR
|
# internal_api_subnet - > IP/CIDR
|
||||||
neutron::agents::ml2::ovs::local_ip: {get_param: [ServiceNetMap, NeutronTenantNetwork]}
|
neutron::agents::ml2::ovs::local_ip: {get_param: [ServiceNetMap, NeutronTenantNetwork]}
|
||||||
neutron::agents::ml2::ovs::firewall_driver: {get_param: NeutronOVSFirewallDriver}
|
|
||||||
tripleo.neutron_ovs_agent.firewall_rules:
|
tripleo.neutron_ovs_agent.firewall_rules:
|
||||||
'118 neutron vxlan networks':
|
'118 neutron vxlan networks':
|
||||||
proto: 'udp'
|
proto: 'udp'
|
||||||
dport: 4789
|
dport: 4789
|
||||||
'136 neutron gre networks':
|
'136 neutron gre networks':
|
||||||
proto: 'gre'
|
proto: 'gre'
|
||||||
|
-
|
||||||
|
if:
|
||||||
|
- no_firewall_driver
|
||||||
|
- {}
|
||||||
|
- neutron::agents::ml2::ovs::firewall_driver: {get_param: NeutronOVSFirewallDriver}
|
||||||
step_config: |
|
step_config: |
|
||||||
include ::tripleo::profile::base::neutron::ovs
|
include ::tripleo::profile::base::neutron::ovs
|
||||||
upgrade_tasks:
|
upgrade_tasks:
|
||||||
|
|
Loading…
Reference in New Issue