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 "Make NeutronEnableDVR parameter consistent"
[apex-tripleo-heat-templates.git]
/
puppet
/
services
/
neutron-ovs-agent.yaml
diff --git
a/puppet/services/neutron-ovs-agent.yaml
b/puppet/services/neutron-ovs-agent.yaml
index
6900194
..
2c23cf5
100644
(file)
--- a/
puppet/services/neutron-ovs-agent.yaml
+++ b/
puppet/services/neutron-ovs-agent.yaml
@@
-1,4
+1,4
@@
-heat_template_version:
ocata
+heat_template_version:
pike
description: >
OpenStack Neutron OVS agent configured with Puppet
description: >
OpenStack Neutron OVS agent configured with Puppet
@@
-53,8
+53,7
@@
parameters:
type: comma_delimited_list
NeutronEnableDVR:
default: False
type: comma_delimited_list
NeutronEnableDVR:
default: False
- description: |
- Enable support for distributed routing in the OVS Agent.
+ description: Enable Neutron DVR.
type: boolean
NeutronEnableARPResponder:
default: false
type: boolean
NeutronEnableARPResponder:
default: false
@@
-92,8
+91,12
@@
resources:
RoleName: {get_param: RoleName}
RoleParameters: {get_param: RoleParameters}
RoleName: {get_param: RoleName}
RoleParameters: {get_param: RoleParameters}
- OpenVswitchUpgrade:
- type: ./openvswitch-upgrade.yaml
+ Ovs:
+ type: ./openvswitch.yaml
+ properties:
+ ServiceNetMap: {get_param: ServiceNetMap}
+ DefaultPasswords: {get_param: DefaultPasswords}
+ EndpointMap: {get_param: EndpointMap}
outputs:
role_data:
outputs:
role_data:
@@
-138,7
+141,7
@@
outputs:
expression: $.data.ovs_upgrade + $.data.neutron_ovs_upgrade
data:
ovs_upgrade:
expression: $.data.ovs_upgrade + $.data.neutron_ovs_upgrade
data:
ovs_upgrade:
- get_attr: [O
penVswitchUpgrade
, role_data, upgrade_tasks]
+ get_attr: [O
vs
, role_data, upgrade_tasks]
neutron_ovs_upgrade:
- name: Check if neutron_ovs_agent is deployed
command: systemctl is-enabled neutron-openvswitch-agent
neutron_ovs_upgrade:
- name: Check if neutron_ovs_agent is deployed
command: systemctl is-enabled neutron-openvswitch-agent