diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-12-07 16:23:33 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-12-07 16:23:33 +0000 |
| commit | 9fac0b99b599e39a956d0b41e402b382adb903f1 (patch) | |
| tree | b71f5648c69b78002af58ac2ccd185f07e27f678 /puppet | |
| parent | 9745e8b82f8e4cb546250533ab5796ae317b4b9a (diff) | |
| parent | d4db12b988186594d0c67e39e1ddab80eed9dde8 (diff) | |
Merge "neutron: don't set router_delete_namespaces"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/services/neutron-l3.yaml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/puppet/services/neutron-l3.yaml b/puppet/services/neutron-l3.yaml index a2157555..dfa8c062 100644 --- a/puppet/services/neutron-l3.yaml +++ b/puppet/services/neutron-l3.yaml @@ -68,8 +68,7 @@ outputs: config_settings: map_merge: - get_attr: [NeutronBase, role_data, config_settings] - - neutron::agents::l3::router_delete_namespaces: True - neutron::agents::l3::agent_mode: {get_param: NeutronL3AgentMode} + - neutron::agents::l3::agent_mode: {get_param: NeutronL3AgentMode} tripleo.neutron_l3.firewall_rules: '106 neutron_l3 vrrp': proto: vrrp |