diff options
| -rw-r--r-- | puppet/ceph-storage.yaml | 8 | ||||
| -rw-r--r-- | puppet/cinder-storage.yaml | 8 | ||||
| -rw-r--r-- | puppet/compute.yaml | 8 | ||||
| -rw-r--r-- | puppet/controller.yaml | 8 | ||||
| -rw-r--r-- | puppet/swift-storage.yaml | 8 |
5 files changed, 40 insertions, 0 deletions
diff --git a/puppet/ceph-storage.yaml b/puppet/ceph-storage.yaml index b34d2c02..d5200da6 100644 --- a/puppet/ceph-storage.yaml +++ b/puppet/ceph-storage.yaml @@ -59,6 +59,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 @@ -86,6 +93,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 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 diff --git a/puppet/compute.yaml b/puppet/compute.yaml index 42c6e276..cf70c662 100644 --- a/puppet/compute.yaml +++ b/puppet/compute.yaml @@ -290,6 +290,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 @@ -320,6 +327,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 diff --git a/puppet/controller.yaml b/puppet/controller.yaml index 97b5456b..b994285e 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -632,6 +632,13 @@ parameters: NodeIndex: type: number default: 0 + 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 @@ -659,6 +666,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 diff --git a/puppet/swift-storage.yaml b/puppet/swift-storage.yaml index a8183f76..e15b2a02 100644 --- a/puppet/swift-storage.yaml +++ b/puppet/swift-storage.yaml @@ -82,6 +82,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 @@ -109,6 +116,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 |