Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Increase libvirt/qemu.conf max_files and max_processes"
[apex-tripleo-heat-templates.git]
/
puppet
/
services
/
neutron-l3.yaml
diff --git
a/puppet/services/neutron-l3.yaml
b/puppet/services/neutron-l3.yaml
index
a215755
..
f8c839d
100644
(file)
--- a/
puppet/services/neutron-l3.yaml
+++ b/
puppet/services/neutron-l3.yaml
@@
-1,4
+1,4
@@
-heat_template_version:
2016-10-14
+heat_template_version:
ocata
description: >
OpenStack Neutron L3 agent configured with Puppet
description: >
OpenStack Neutron L3 agent configured with Puppet
@@
-68,8
+68,7
@@
outputs:
config_settings:
map_merge:
- get_attr: [NeutronBase, role_data, config_settings]
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
tripleo.neutron_l3.firewall_rules:
'106 neutron_l3 vrrp':
proto: vrrp