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
Stop nova-api before upgrading package
[apex-tripleo-heat-templates.git]
/
puppet
/
services
/
opendaylight-ovs.yaml
diff --git
a/puppet/services/opendaylight-ovs.yaml
b/puppet/services/opendaylight-ovs.yaml
index
ea7410c
..
cfec3c4
100644
(file)
--- a/
puppet/services/opendaylight-ovs.yaml
+++ b/
puppet/services/opendaylight-ovs.yaml
@@
-1,4
+1,4
@@
-heat_template_version:
2016-04-08
+heat_template_version:
ocata
description: >
OpenDaylight OVS Configuration.
description: >
OpenDaylight OVS Configuration.
@@
-8,6
+8,15
@@
parameters:
default: 8081
description: Set opendaylight service port
type: number
default: 8081
description: Set opendaylight service port
type: number
+ OpenDaylightUsername:
+ default: 'admin'
+ description: The username for the opendaylight server.
+ type: string
+ OpenDaylightPassword:
+ default: 'admin'
+ type: string
+ description: The password for the opendaylight server.
+ hidden: true
OpenDaylightConnectionProtocol:
description: L7 protocol used for REST access
type: string
OpenDaylightConnectionProtocol:
description: L7 protocol used for REST access
type: string
@@
-46,12
+55,21
@@
outputs:
service_name: opendaylight_ovs
config_settings:
opendaylight::odl_rest_port: {get_param: OpenDaylightPort}
service_name: opendaylight_ovs
config_settings:
opendaylight::odl_rest_port: {get_param: OpenDaylightPort}
+ opendaylight::username: {get_param: OpenDaylightUsername}
+ opendaylight::password: {get_param: OpenDaylightPassword}
opendaylight_check_url: {get_param: OpenDaylightCheckURL}
opendaylight::nb_connection_protocol: {get_param: OpenDaylightConnectionProtocol}
opendaylight_check_url: {get_param: OpenDaylightCheckURL}
opendaylight::nb_connection_protocol: {get_param: OpenDaylightConnectionProtocol}
+ neutron::agents::ml2::ovs::local_ip: {get_param: [ServiceNetMap, NeutronTenantNetwork]}
neutron::plugins::ovs::opendaylight::provider_mappings:
str_replace:
template: MAPPINGS
params:
MAPPINGS: {get_param: OpenDaylightProviderMappings}
neutron::plugins::ovs::opendaylight::provider_mappings:
str_replace:
template: MAPPINGS
params:
MAPPINGS: {get_param: OpenDaylightProviderMappings}
+ tripleo.opendaylight_ovs.firewall_rules:
+ '118 neutron vxlan networks':
+ proto: 'udp'
+ dport: 4789
+ '136 neutron gre networks':
+ proto: 'gre'
step_config: |
include tripleo::profile::base::neutron::plugins::ovs::opendaylight
step_config: |
include tripleo::profile::base::neutron::plugins::ovs::opendaylight