Merge "Add specific pass-through config for each role"
authorJenkins <jenkins@review.openstack.org>
Wed, 10 Sep 2014 12:01:42 +0000 (12:01 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 10 Sep 2014 12:01:42 +0000 (12:01 +0000)
1  2 
nova-compute-config.yaml
nova-compute-instance.yaml
overcloud-source.yaml

Simple merge
Simple merge
@@@ -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: