From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 10 Sep 2014 12:01:42 +0000 (+0000)
Subject: Merge "Add specific pass-through config for each role"
X-Git-Tag: opnfv-6.0.0~2748
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=218bd3cad53aef9b9890bc3119a4280c7e54806e;p=apex-tripleo-heat-templates.git

Merge "Add specific pass-through config for each role"
---

218bd3cad53aef9b9890bc3119a4280c7e54806e
diff --cc overcloud-source.yaml
index d4f157a8,20e827a5..3dbd5712
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@@ -742,10 -706,9 +765,10 @@@ resources
          - network: ctlplane
        user_data_format: SOFTWARE_CONFIG
    controller0AllNodesDeployment:
-     depends_on: [controller0Deployment,controller0SSLDeployment,controller0Swift,controller0Passthrough]
+     depends_on: [controller0Deployment,controller0SSLDeployment,controller0Swift,controller0PassthroughSpecific]
      type: OS::Heat::StructuredDeployment
      properties:
 +      signal_transport: {get_param: DefaultSignalTransport}
        config: {get_resource: allNodesConfig}
        server: {get_resource: controller0}
    controller0Deployment: