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 "Update the template_version alias for all the templates to pike."
[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
e55cd2e
..
af85f4a
100644
(file)
--- a/
puppet/services/opendaylight-api.yaml
+++ b/
puppet/services/opendaylight-api.yaml
@@
-1,4
+1,4
@@
-heat_template_version:
ocata
+heat_template_version:
pike
description: >
OpenDaylight SDN Controller.
description: >
OpenDaylight SDN Controller.
@@
-28,7
+28,7
@@
parameters:
OpenDaylightFeatures:
description: List of features to install with ODL
type: comma_delimited_list
OpenDaylightFeatures:
description: List of features to install with ODL
type: comma_delimited_list
- default: ["odl-netvirt-openstack","odl-netvirt-ui"]
+ default: ["odl-netvirt-openstack","odl-netvirt-ui"
,"odl-jolokia"
]
OpenDaylightApiVirtualIP:
type: string
default: ''
OpenDaylightApiVirtualIP:
type: string
default: ''
@@
-46,6
+46,14
@@
parameters:
DefaultPasswords:
default: {}
type: json
DefaultPasswords:
default: {}
type: json
+ RoleName:
+ default: ''
+ description: Role name on which the service is applied
+ type: string
+ RoleParameters:
+ default: {}
+ description: Parameters specific to the role
+ type: json
outputs:
role_data:
outputs:
role_data:
@@
-66,6
+74,7
@@
outputs:
- {get_param: OpenDaylightPort}
- 6640
- 6653
- {get_param: OpenDaylightPort}
- 6640
- 6653
+ - 2550
step_config: |
include tripleo::profile::base::neutron::opendaylight
upgrade_tasks:
step_config: |
include tripleo::profile::base::neutron::opendaylight
upgrade_tasks: