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 "Sample environment generator"
[apex-tripleo-heat-templates.git]
/
puppet
/
services
/
manila-scheduler.yaml
diff --git
a/puppet/services/manila-scheduler.yaml
b/puppet/services/manila-scheduler.yaml
index
474cc24
..
b3d1ffa
100644
(file)
--- a/
puppet/services/manila-scheduler.yaml
+++ b/
puppet/services/manila-scheduler.yaml
@@
-1,4
+1,4
@@
-heat_template_version:
2016-04-08
+heat_template_version:
pike
description: >
Manila-scheduler service configured with Puppet
description: >
Manila-scheduler service configured with Puppet
@@
-13,6
+13,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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@@
-41,6
+49,8
@@
resources:
ServiceNetMap: {get_param: ServiceNetMap}
DefaultPasswords: {get_param: DefaultPasswords}
EndpointMap: {get_param: EndpointMap}
ServiceNetMap: {get_param: ServiceNetMap}
DefaultPasswords: {get_param: DefaultPasswords}
EndpointMap: {get_param: EndpointMap}
+ RoleName: {get_param: RoleName}
+ RoleParameters: {get_param: RoleParameters}
outputs:
role_data:
outputs:
role_data:
@@
-57,14
+67,5
@@
outputs:
manila::network::neutron::neutron_url: {get_param: [EndpointMap, NeutronInternal, uri]}
manila::network::neutron::neutron_admin_auth_url: {get_param: [EndpointMap, NeutronAdmin, uri]}
manila::network::neutron::neutron_admin_password: {get_param: NeutronPassword}
manila::network::neutron::neutron_url: {get_param: [EndpointMap, NeutronInternal, uri]}
manila::network::neutron::neutron_admin_auth_url: {get_param: [EndpointMap, NeutronAdmin, uri]}
manila::network::neutron::neutron_admin_password: {get_param: NeutronPassword}
- manila::sql_connection:
- list_join:
- - ''
- - - {get_param: [EndpointMap, MysqlInternal, protocol]}
- - '://manila:'
- - {get_param: ManilaPassword}
- - '@'
- - {get_param: [EndpointMap, MysqlInternal, host]}
- - '/manila'
step_config: |
include ::tripleo::profile::base::manila::scheduler
step_config: |
include ::tripleo::profile::base::manila::scheduler