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 "Add integration with Manila CephFS Native driver"
[apex-tripleo-heat-templates.git]
/
puppet
/
extraconfig
/
all_nodes
/
neutron-midonet-all-nodes.yaml
diff --git
a/puppet/extraconfig/all_nodes/neutron-midonet-all-nodes.yaml
b/puppet/extraconfig/all_nodes/neutron-midonet-all-nodes.yaml
index
3e45534
..
6a2ea4d
100644
(file)
--- a/
puppet/extraconfig/all_nodes/neutron-midonet-all-nodes.yaml
+++ b/
puppet/extraconfig/all_nodes/neutron-midonet-all-nodes.yaml
@@
-4,15
+4,7
@@
description: Configure hieradata for all MidoNet nodes
parameters:
# Parameters passed from the parent template
parameters:
# Parameters passed from the parent template
- controller_servers:
- type: json
- compute_servers:
- type: json
- blockstorage_servers:
- type: json
- objectstorage_servers:
- type: json
- cephstorage_servers:
+ servers:
type: json
EnableZookeeperOnController:
type: json
EnableZookeeperOnController:
@@
-102,18
+94,10
@@
resources:
type: OS::Heat::StructuredDeploymentGroup
properties:
config: {get_resource: NetworkMidoNetConfig}
type: OS::Heat::StructuredDeploymentGroup
properties:
config: {get_resource: NetworkMidoNetConfig}
- servers: {get_param:
controller_servers
}
+ servers: {get_param:
[servers, Controller]
}
NetworkMidonetDeploymentComputes:
type: OS::Heat::StructuredDeploymentGroup
properties:
config: {get_resource: NetworkMidoNetConfig}
NetworkMidonetDeploymentComputes:
type: OS::Heat::StructuredDeploymentGroup
properties:
config: {get_resource: NetworkMidoNetConfig}
- servers: {get_param: compute_servers}
-
-outputs:
- config_identifier:
- value:
- list_join:
- - ' '
- - - {get_attr: [NetworkMidonetDeploymentControllers, deploy_stdouts]}
- - {get_attr: [NetworkMidonetDeploymentComputes, deploy_stdouts]}
+ servers: {get_param: [servers, Compute]}