X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fextraconfig%2Fall_nodes%2Fneutron-midonet-all-nodes.yaml;h=6a2ea4d5f21d145279c02abd1bbd016d80acb31d;hb=9393a3e2a57d293eabe1fcfb702b0cecdf5e60ff;hp=3e455347e8f49f4c293261ed6fb7d46b3dfd36ba;hpb=4087aff69b13843ab73538c65b4b5823d46fb629;p=apex-tripleo-heat-templates.git

diff --git a/puppet/extraconfig/all_nodes/neutron-midonet-all-nodes.yaml b/puppet/extraconfig/all_nodes/neutron-midonet-all-nodes.yaml
index 3e455347..6a2ea4d5 100644
--- 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
-  controller_servers:
-    type: json
-  compute_servers:
-    type: json
-  blockstorage_servers:
-    type: json
-  objectstorage_servers:
-    type: json
-  cephstorage_servers:
+  servers:
     type: json
 
   EnableZookeeperOnController:
@@ -102,18 +94,10 @@ resources:
     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}
-      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]}