From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 21 Dec 2015 20:27:10 +0000 (+0000)
Subject: Merge "Add SoftwareConfigTransport for switching transports"
X-Git-Tag: opnfv-6.0.0~2250
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=92c994deb8a3719cf7853f46b0aa0b52489fc368;p=apex-tripleo-heat-templates.git

Merge "Add SoftwareConfigTransport for switching transports"
---

92c994deb8a3719cf7853f46b0aa0b52489fc368
diff --cc puppet/ceph-storage.yaml
index b6a1007a,d5200da6..341b7d0d
--- a/puppet/ceph-storage.yaml
+++ b/puppet/ceph-storage.yaml
@@@ -89,8 -93,8 +96,9 @@@ resources
        user_data_format: SOFTWARE_CONFIG
        user_data: {get_resource: UserData}
        name: {get_param: Hostname}
+       software_config_transport: {get_param: SoftwareConfigTransport}
        metadata: {get_param: ServerMetadata}
 +      scheduler_hints: {get_param: SchedulerHints}
  
    # Combine the NodeAdminUserData and NodeUserData mime archives
    UserData:
diff --cc puppet/cinder-storage.yaml
index fc197059,0f44132f..6ce6edfe
--- a/puppet/cinder-storage.yaml
+++ b/puppet/cinder-storage.yaml
@@@ -143,8 -146,8 +150,9 @@@ resources
        user_data_format: SOFTWARE_CONFIG
        user_data: {get_resource: UserData}
        name: {get_param: Hostname}
+       software_config_transport: {get_param: SoftwareConfigTransport}
        metadata: {get_param: ServerMetadata}
 +      scheduler_hints: {get_param: SchedulerHints}
  
    # Combine the NodeAdminUserData and NodeUserData mime archives
    UserData:
diff --cc puppet/compute.yaml
index 43ef5820,cf70c662..7be8126d
--- a/puppet/compute.yaml
+++ b/puppet/compute.yaml
@@@ -321,8 -327,8 +328,9 @@@ resources
        user_data_format: SOFTWARE_CONFIG
        user_data: {get_resource: UserData}
        name: {get_param: Hostname}
+       software_config_transport: {get_param: SoftwareConfigTransport}
        metadata: {get_param: ServerMetadata}
 +      scheduler_hints: {get_param: SchedulerHints}
  
    # Combine the NodeAdminUserData and NodeUserData mime archives
    UserData:
diff --cc puppet/controller.yaml
index 20379292,b994285e..8a37cd55
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@@ -702,8 -666,8 +709,9 @@@ resources
        user_data_format: SOFTWARE_CONFIG
        user_data: {get_resource: UserData}
        name: {get_param: Hostname}
+       software_config_transport: {get_param: SoftwareConfigTransport}
        metadata: {get_param: ServerMetadata}
 +      scheduler_hints: {get_param: SchedulerHints}
  
    # Combine the NodeAdminUserData and NodeUserData mime archives
    UserData:
diff --cc puppet/swift-storage.yaml
index 721dcba4,e15b2a02..9cda5900
--- a/puppet/swift-storage.yaml
+++ b/puppet/swift-storage.yaml
@@@ -112,8 -116,8 +119,9 @@@ resources
        user_data_format: SOFTWARE_CONFIG
        user_data: {get_resource: UserData}
        name: {get_param: Hostname}
+       software_config_transport: {get_param: SoftwareConfigTransport}
        metadata: {get_param: ServerMetadata}
 +      scheduler_hints: {get_param: SchedulerHints}
  
    # Combine the NodeAdminUserData and NodeUserData mime archives
    UserData: