Merge "Add HostnameMap to allow granular control of hostnames"
This commit is contained in:
commit
0ed6bb6be8
|
@ -47,6 +47,10 @@ parameters:
|
|||
Hostname:
|
||||
type: string
|
||||
default: '' # Defaults to Heat created hostname
|
||||
HostnameMap:
|
||||
type: json
|
||||
default: {}
|
||||
description: Optional mapping to override hostnames
|
||||
ExtraConfig:
|
||||
default: {}
|
||||
description: |
|
||||
|
@ -99,7 +103,10 @@ resources:
|
|||
- network: ctlplane
|
||||
user_data_format: SOFTWARE_CONFIG
|
||||
user_data: {get_resource: UserData}
|
||||
name: {get_param: Hostname}
|
||||
name:
|
||||
str_replace:
|
||||
template: {get_param: Hostname}
|
||||
params: {get_param: HostnameMap}
|
||||
software_config_transport: {get_param: SoftwareConfigTransport}
|
||||
metadata: {get_param: ServerMetadata}
|
||||
scheduler_hints: {get_param: SchedulerHints}
|
||||
|
|
|
@ -89,6 +89,10 @@ parameters:
|
|||
Hostname:
|
||||
type: string
|
||||
default: '' # Defaults to Heat created hostname
|
||||
HostnameMap:
|
||||
type: json
|
||||
default: {}
|
||||
description: Optional mapping to override hostnames
|
||||
ServiceNetMap:
|
||||
default: {}
|
||||
description: Mapping of service_name -> network name. Typically set
|
||||
|
@ -151,7 +155,10 @@ resources:
|
|||
- network: ctlplane
|
||||
user_data_format: SOFTWARE_CONFIG
|
||||
user_data: {get_resource: UserData}
|
||||
name: {get_param: Hostname}
|
||||
name:
|
||||
str_replace:
|
||||
template: {get_param: Hostname}
|
||||
params: {get_param: HostnameMap}
|
||||
software_config_transport: {get_param: SoftwareConfigTransport}
|
||||
metadata: {get_param: ServerMetadata}
|
||||
scheduler_hints: {get_param: SchedulerHints}
|
||||
|
|
|
@ -298,6 +298,10 @@ parameters:
|
|||
Hostname:
|
||||
type: string
|
||||
default: '' # Defaults to Heat created hostname
|
||||
HostnameMap:
|
||||
type: json
|
||||
default: {}
|
||||
description: Optional mapping to override hostnames
|
||||
NetworkDeploymentActions:
|
||||
type: comma_delimited_list
|
||||
description: >
|
||||
|
@ -342,7 +346,10 @@ resources:
|
|||
- network: ctlplane
|
||||
user_data_format: SOFTWARE_CONFIG
|
||||
user_data: {get_resource: UserData}
|
||||
name: {get_param: Hostname}
|
||||
name:
|
||||
str_replace:
|
||||
template: {get_param: Hostname}
|
||||
params: {get_param: HostnameMap}
|
||||
software_config_transport: {get_param: SoftwareConfigTransport}
|
||||
metadata: {get_param: ServerMetadata}
|
||||
scheduler_hints: {get_param: SchedulerHints}
|
||||
|
|
|
@ -700,6 +700,10 @@ parameters:
|
|||
Hostname:
|
||||
type: string
|
||||
default: '' # Defaults to Heat created hostname
|
||||
HostnameMap:
|
||||
type: json
|
||||
default: {}
|
||||
description: Optional mapping to override hostnames
|
||||
NetworkDeploymentActions:
|
||||
type: comma_delimited_list
|
||||
description: >
|
||||
|
@ -745,7 +749,10 @@ resources:
|
|||
- network: ctlplane
|
||||
user_data_format: SOFTWARE_CONFIG
|
||||
user_data: {get_resource: UserData}
|
||||
name: {get_param: Hostname}
|
||||
name:
|
||||
str_replace:
|
||||
template: {get_param: Hostname}
|
||||
params: {get_param: HostnameMap}
|
||||
software_config_transport: {get_param: SoftwareConfigTransport}
|
||||
metadata: {get_param: ServerMetadata}
|
||||
scheduler_hints: {get_param: SchedulerHints}
|
||||
|
|
|
@ -68,6 +68,10 @@ parameters:
|
|||
Hostname:
|
||||
type: string
|
||||
default: '' # Defaults to Heat created hostname
|
||||
HostnameMap:
|
||||
type: json
|
||||
default: {}
|
||||
description: Optional mapping to override hostnames
|
||||
ExtraConfig:
|
||||
default: {}
|
||||
description: |
|
||||
|
@ -120,7 +124,10 @@ resources:
|
|||
- network: ctlplane
|
||||
user_data_format: SOFTWARE_CONFIG
|
||||
user_data: {get_resource: UserData}
|
||||
name: {get_param: Hostname}
|
||||
name:
|
||||
str_replace:
|
||||
template: {get_param: Hostname}
|
||||
params: {get_param: HostnameMap}
|
||||
software_config_transport: {get_param: SoftwareConfigTransport}
|
||||
metadata: {get_param: ServerMetadata}
|
||||
scheduler_hints: {get_param: SchedulerHints}
|
||||
|
|
Loading…
Reference in New Issue