From 572903cd21fdfd968126ab1e524d2f3757d31ccb Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Fri, 27 Nov 2015 04:35:27 +0000 Subject: Add SoftwareConfigTransport for switching transports This change adds a SoftwareConfigTransport parameter to role templates so that the transport can be changed via a parameter_defaults entry. This change will have no effect on an existing overcloud as the current default POLL_SERVER_CFN is now explicit in the parameter default. Change-Id: I5c2a2d2170714093c5757282cba12ac65f8738a4 --- puppet/cinder-storage.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'puppet/cinder-storage.yaml') diff --git a/puppet/cinder-storage.yaml b/puppet/cinder-storage.yaml index 82c0e814..0f44132f 100644 --- a/puppet/cinder-storage.yaml +++ b/puppet/cinder-storage.yaml @@ -112,6 +112,13 @@ parameters: description: > Heat action when to apply network configuration changes default: ['CREATE'] + SoftwareConfigTransport: + default: POLL_SERVER_CFN + description: | + How the server should receive the metadata required for software configuration. + type: string + constraints: + - allowed_values: [POLL_SERVER_CFN, POLL_SERVER_HEAT, POLL_TEMP_URL, ZAQAR_MESSAGE] CloudDomain: default: '' type: string @@ -139,6 +146,7 @@ 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} # Combine the NodeAdminUserData and NodeUserData mime archives -- cgit 1.2.3-korg