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
Fix bogus parameters in get_param
[apex-tripleo-heat-templates.git]
/
puppet
/
services
/
opendaylight-api.yaml
diff --git
a/puppet/services/opendaylight-api.yaml
b/puppet/services/opendaylight-api.yaml
index
253d63e
..
beee48e
100644
(file)
--- a/
puppet/services/opendaylight-api.yaml
+++ b/
puppet/services/opendaylight-api.yaml
@@
-1,4
+1,4
@@
-heat_template_version:
2016-04-08
+heat_template_version:
ocata
description: >
OpenDaylight SDN Controller.
description: >
OpenDaylight SDN Controller.
@@
-17,10
+17,10
@@
parameters:
type: string
description: The password for the opendaylight server.
hidden: true
type: string
description: The password for the opendaylight server.
hidden: true
- OpenDaylight
EnableL3
:
- description:
Knob to enable/disable ODL L3
+ OpenDaylight
ConnectionProtocol
:
+ description:
L7 protocol used for REST access
type: string
type: string
- default: '
no
'
+ default: '
http
'
OpenDaylightEnableDHCP:
description: Knob to enable/disable ODL DHCP Server
type: boolean
OpenDaylightEnableDHCP:
description: Knob to enable/disable ODL DHCP Server
type: boolean
@@
-56,9
+56,15
@@
outputs:
opendaylight::odl_rest_port: {get_param: OpenDaylightPort}
opendaylight::username: {get_param: OpenDaylightUsername}
opendaylight::password: {get_param: OpenDaylightPassword}
opendaylight::odl_rest_port: {get_param: OpenDaylightPort}
opendaylight::username: {get_param: OpenDaylightUsername}
opendaylight::password: {get_param: OpenDaylightPassword}
- opendaylight::enable_l3: {get_param: OpenDaylightEnableL3}
opendaylight::extra_features: {get_param: OpenDaylightFeatures}
opendaylight::enable_dhcp: {get_param: OpenDaylightEnableDHCP}
opendaylight::odl_bind_ip: {get_param: [ServiceNetMap, OpendaylightApiNetwork]}
opendaylight::extra_features: {get_param: OpenDaylightFeatures}
opendaylight::enable_dhcp: {get_param: OpenDaylightEnableDHCP}
opendaylight::odl_bind_ip: {get_param: [ServiceNetMap, OpendaylightApiNetwork]}
+ opendaylight::nb_connection_protocol: {get_param: OpenDaylightConnectionProtocol}
+ tripleo.opendaylight_api.firewall_rules:
+ '137 opendaylight api':
+ dport:
+ - {get_param: OpenDaylightPort}
+ - 6640
+ - 6653
step_config: |
include tripleo::profile::base::neutron::opendaylight
step_config: |
include tripleo::profile::base::neutron::opendaylight