Merge "Add SoftwareConfigTransport for switching transports"

diff --cc puppet/ceph-storage.yaml
index b6a1007,d5200da..341b7d0
--- 1/puppet/ceph-storage.yaml
--- 2/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 fc19705,0f44132..6ce6edf
--- 1/puppet/cinder-storage.yaml
--- 2/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 43ef582,cf70c66..7be8126
--- 1/puppet/compute.yaml
--- 2/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 2037929,b994285..8a37cd5
--- 1/puppet/controller.yaml
--- 2/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 721dcba,e15b2a0..9cda590
--- 1/puppet/swift-storage.yaml
--- 2/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: