From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 16 Sep 2016 19:31:08 +0000 (+0000)
Subject: Merge "Convert UpdateWorkflow to support composable roles"
X-Git-Tag: opnfv-6.0.0~1600
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=1e92d33d96e0c5aa1b1b5a2678433e97bade803a;p=apex-tripleo-heat-templates.git

Merge "Convert UpdateWorkflow to support composable roles"
---

1e92d33d96e0c5aa1b1b5a2678433e97bade803a
diff --cc extraconfig/tasks/major_upgrade_pacemaker.yaml
index 9e14fe5d,ec36ba55..e030ca05
--- a/extraconfig/tasks/major_upgrade_pacemaker.yaml
+++ b/extraconfig/tasks/major_upgrade_pacemaker.yaml
@@@ -54,10 -46,9 +46,10 @@@ resources
    CephMonUpgradeDeployment:
      type: OS::Heat::SoftwareDeploymentGroup
      properties:
-       servers: {get_param: controller_servers}
+       servers: {get_param: servers, Controller}
        config: {get_resource: CephMonUpgradeConfig}
        input_values: {get_param: input_values}
 +    update_policy:
        batch_create:
          max_batch_size: 1
        rolling_update: