Merge "neutron: don't set external_network_bridge option by default"

[apex-tripleo-heat-templates.git] / extraconfig / tasks / mitaka_to_newton_aodh_data_migration.yaml

diff --git a/extraconfig/tasks/mitaka_to_newton_aodh_data_migration.yaml b/extraconfig/tasks/mitaka_to_newton_aodh_data_migration.yaml
index 9414ac1..45933fb 100644 (file)
--- a/extraconfig/tasks/mitaka_to_newton_aodh_data_migration.yaml
+++ b/extraconfig/tasks/mitaka_to_newton_aodh_data_migration.yaml
@@ -1,18 +1,10 @@
-heat_template_version: 2014-10-16
+heat_template_version: ocata
 
 description: >
   Software-config for performing aodh data migration
 
 parameters:
-  controller_servers:
-    type: json
-  compute_servers:
-    type: json
-  blockstorage_servers:
-    type: json
-  objectstorage_servers:
-    type: json
-  cephstorage_servers:
+  servers:
     type: json
   input_values:
     type: json
@@ -28,6 +20,6 @@ resources:
   AodhMysqlMigrationScriptDeployment:
     type: OS::Heat::SoftwareDeploymentGroup
     properties:
-      servers:  {get_param: controller_servers}
+      servers:  {get_param: [servers, Controller]}
       config: {get_resource: AodhMysqlMigrationScriptConfig}
       input_values: {get_param: input_values}