diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-01-18 10:19:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-01-18 10:19:41 +0000 |
| commit | ce1b18a32f58eade5b004bdf77f105ca9ee6ff18 (patch) | |
| tree | b400b7c9af4a8e976884f8599724e7988516594b | |
| parent | 56daab11dce0e780fbc98e55d39a1ec0efcdcffa (diff) | |
| parent | 18e6dc96e5b11d1f3708aad9aacf0c699386791f (diff) | |
Merge "Conditionally set OVS agent firewall driver"
| -rw-r--r-- | puppet/services/neutron-ovs-agent.yaml | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/puppet/services/neutron-ovs-agent.yaml b/puppet/services/neutron-ovs-agent.yaml index 0eb16e6a..e24fae7c 100644 --- a/puppet/services/neutron-ovs-agent.yaml +++ b/puppet/services/neutron-ovs-agent.yaml @@ -70,6 +70,9 @@ parameters: tag: openstack.neutron.agent.openvswitch path: /var/log/neutron/openvswitch-agent.log +conditions: + no_firewall_driver: {equals : [{get_param: NeutronOVSFirewallDriver}, '']} + resources: NeutronBase: @@ -104,13 +107,17 @@ outputs: # internal_api_uri -> [IP] # internal_api_subnet - > IP/CIDR 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: '118 neutron vxlan networks': proto: 'udp' dport: 4789 '136 neutron gre networks': proto: 'gre' + - + if: + - no_firewall_driver + - {} + - neutron::agents::ml2::ovs::firewall_driver: {get_param: NeutronOVSFirewallDriver} step_config: | include ::tripleo::profile::base::neutron::ovs upgrade_tasks: |