Merge "Introduce role-specific nova-server-metadata"
This commit is contained in:
commit
3f2242d05e
|
@ -71,11 +71,20 @@ parameters:
|
|||
description: >
|
||||
The DNS domain used for the hosts. This should match the dhcp_domain
|
||||
configured in the Undercloud neutron. Defaults to localdomain.
|
||||
BlockStorageServerMetadata:
|
||||
default: {}
|
||||
description: >
|
||||
Extra properties or metadata passed to Nova for the created nodes in
|
||||
the overcloud. It's accessible via the Nova metadata API. This option is
|
||||
role-specific and is merged with the values given to the ServerMetadata
|
||||
parameter.
|
||||
type: json
|
||||
ServerMetadata:
|
||||
default: {}
|
||||
description: >
|
||||
Extra properties or metadata passed to Nova for the created nodes in
|
||||
the overcloud. It's accessible via the Nova metadata API.
|
||||
the overcloud. It's accessible via the Nova metadata API. This applies to
|
||||
all roles and is merged with a role-specific metadata parameter.
|
||||
type: json
|
||||
BlockStorageSchedulerHints:
|
||||
type: json
|
||||
|
@ -118,7 +127,10 @@ resources:
|
|||
template: {get_param: Hostname}
|
||||
params: {get_param: HostnameMap}
|
||||
software_config_transport: {get_param: SoftwareConfigTransport}
|
||||
metadata: {get_param: ServerMetadata}
|
||||
metadata:
|
||||
map_merge:
|
||||
- {get_param: ServerMetadata}
|
||||
- {get_param: BlockStorageServerMetadata}
|
||||
scheduler_hints: {get_param: BlockStorageSchedulerHints}
|
||||
|
||||
# Combine the NodeAdminUserData and NodeUserData mime archives
|
||||
|
|
|
@ -77,11 +77,20 @@ parameters:
|
|||
description: >
|
||||
The DNS domain used for the hosts. This should match the dhcp_domain
|
||||
configured in the Undercloud neutron. Defaults to localdomain.
|
||||
CephStorageServerMetadata:
|
||||
default: {}
|
||||
description: >
|
||||
Extra properties or metadata passed to Nova for the created nodes in
|
||||
the overcloud. It's accessible via the Nova metadata API. This option is
|
||||
role-specific and is merged with the values given to the ServerMetadata
|
||||
parameter.
|
||||
type: json
|
||||
ServerMetadata:
|
||||
default: {}
|
||||
description: >
|
||||
Extra properties or metadata passed to Nova for the created nodes in
|
||||
the overcloud. It's accessible via the Nova metadata API.
|
||||
the overcloud. It's accessible via the Nova metadata API. This applies to
|
||||
all roles and is merged with a role-specific metadata parameter.
|
||||
type: json
|
||||
CephStorageSchedulerHints:
|
||||
type: json
|
||||
|
@ -124,7 +133,10 @@ resources:
|
|||
template: {get_param: Hostname}
|
||||
params: {get_param: HostnameMap}
|
||||
software_config_transport: {get_param: SoftwareConfigTransport}
|
||||
metadata: {get_param: ServerMetadata}
|
||||
metadata:
|
||||
map_merge:
|
||||
- {get_param: ServerMetadata}
|
||||
- {get_param: CephStorageServerMetadata}
|
||||
scheduler_hints: {get_param: CephStorageSchedulerHints}
|
||||
|
||||
# Combine the NodeAdminUserData and NodeUserData mime archives
|
||||
|
|
|
@ -92,11 +92,20 @@ parameters:
|
|||
description: >
|
||||
The DNS domain used for the hosts. This should match the dhcp_domain
|
||||
configured in the Undercloud neutron. Defaults to localdomain.
|
||||
NovaComputeServerMetadata:
|
||||
default: {}
|
||||
description: >
|
||||
Extra properties or metadata passed to Nova for the created nodes in
|
||||
the overcloud. It's accessible via the Nova metadata API. This option is
|
||||
role-specific and is merged with the values given to the ServerMetadata
|
||||
parameter.
|
||||
type: json
|
||||
ServerMetadata:
|
||||
default: {}
|
||||
description: >
|
||||
Extra properties or metadata passed to Nova for the created nodes in
|
||||
the overcloud. It's accessible via the Nova metadata API.
|
||||
the overcloud. It's accessible via the Nova metadata API. This applies to
|
||||
all roles and is merged with a role-specific metadata parameter.
|
||||
type: json
|
||||
NovaComputeSchedulerHints:
|
||||
type: json
|
||||
|
@ -138,7 +147,10 @@ resources:
|
|||
template: {get_param: Hostname}
|
||||
params: {get_param: HostnameMap}
|
||||
software_config_transport: {get_param: SoftwareConfigTransport}
|
||||
metadata: {get_param: ServerMetadata}
|
||||
metadata:
|
||||
map_merge:
|
||||
- {get_param: ServerMetadata}
|
||||
- {get_param: NovaComputeServerMetadata}
|
||||
scheduler_hints: {get_param: NovaComputeSchedulerHints}
|
||||
|
||||
# Combine the NodeAdminUserData and NodeUserData mime archives
|
||||
|
|
|
@ -106,11 +106,20 @@ parameters:
|
|||
description: >
|
||||
The DNS domain used for the hosts. This should match the dhcp_domain
|
||||
configured in the Undercloud neutron. Defaults to localdomain.
|
||||
ControllerServerMetadata:
|
||||
default: {}
|
||||
description: >
|
||||
Extra properties or metadata passed to Nova for the created nodes in
|
||||
the overcloud. It's accessible via the Nova metadata API. This option is
|
||||
role-specific and is merged with the values given to the ServerMetadata
|
||||
parameter.
|
||||
type: json
|
||||
ServerMetadata:
|
||||
default: {}
|
||||
description: >
|
||||
Extra properties or metadata passed to Nova for the created nodes in
|
||||
the overcloud. It's accessible via the Nova metadata API.
|
||||
the overcloud. It's accessible via the Nova metadata API. This applies to
|
||||
all roles and is merged with a role-specific metadata parameter.
|
||||
type: json
|
||||
ControllerSchedulerHints:
|
||||
type: json
|
||||
|
@ -157,7 +166,10 @@ resources:
|
|||
template: {get_param: Hostname}
|
||||
params: {get_param: HostnameMap}
|
||||
software_config_transport: {get_param: SoftwareConfigTransport}
|
||||
metadata: {get_param: ServerMetadata}
|
||||
metadata:
|
||||
map_merge:
|
||||
- {get_param: ServerMetadata}
|
||||
- {get_param: ControllerServerMetadata}
|
||||
scheduler_hints: {get_param: ControllerSchedulerHints}
|
||||
|
||||
# Combine the NodeAdminUserData and NodeUserData mime archives
|
||||
|
|
|
@ -71,11 +71,20 @@ parameters:
|
|||
description: >
|
||||
The DNS domain used for the hosts. This should match the dhcp_domain
|
||||
configured in the Undercloud neutron. Defaults to localdomain.
|
||||
SwiftStorageServerMetadata:
|
||||
default: {}
|
||||
description: >
|
||||
Extra properties or metadata passed to Nova for the created nodes in
|
||||
the overcloud. It's accessible via the Nova metadata API. This option is
|
||||
role-specific and is merged with the values given to the ServerMetadata
|
||||
parameter.
|
||||
type: json
|
||||
ServerMetadata:
|
||||
default: {}
|
||||
description: >
|
||||
Extra properties or metadata passed to Nova for the created nodes in
|
||||
the overcloud. It's accessible via the Nova metadata API.
|
||||
the overcloud. It's accessible via the Nova metadata API. This applies to
|
||||
all roles and is merged with a role-specific metadata parameter.
|
||||
type: json
|
||||
ObjectStorageSchedulerHints:
|
||||
type: json
|
||||
|
@ -118,7 +127,10 @@ resources:
|
|||
template: {get_param: Hostname}
|
||||
params: {get_param: HostnameMap}
|
||||
software_config_transport: {get_param: SoftwareConfigTransport}
|
||||
metadata: {get_param: ServerMetadata}
|
||||
metadata:
|
||||
map_merge:
|
||||
- {get_param: ServerMetadata}
|
||||
- {get_param: SwiftStorageServerMetadata}
|
||||
scheduler_hints: {get_param: ObjectStorageSchedulerHints}
|
||||
|
||||
# Combine the NodeAdminUserData and NodeUserData mime archives
|
||||
|
|
|
@ -83,11 +83,20 @@ parameters:
|
|||
description: >
|
||||
The DNS domain used for the hosts. This should match the dhcp_domain
|
||||
configured in the Undercloud neutron. Defaults to localdomain.
|
||||
{{role}}ServerMetadata:
|
||||
default: {}
|
||||
description: >
|
||||
Extra properties or metadata passed to Nova for the created nodes in
|
||||
the overcloud. It's accessible via the Nova metadata API. This option is
|
||||
role-specific and is merged with the values given to the ServerMetadata
|
||||
parameter.
|
||||
type: json
|
||||
ServerMetadata:
|
||||
default: {}
|
||||
description: >
|
||||
Extra properties or metadata passed to Nova for the created nodes in
|
||||
the overcloud. It's accessible via the Nova metadata API.
|
||||
the overcloud. It's accessible via the Nova metadata API. This applies to
|
||||
all roles and is merged with a role-specific metadata parameter.
|
||||
type: json
|
||||
{{role}}SchedulerHints:
|
||||
type: json
|
||||
|
@ -136,7 +145,10 @@ resources:
|
|||
template: {get_param: Hostname}
|
||||
params: {get_param: HostnameMap}
|
||||
software_config_transport: {get_param: SoftwareConfigTransport}
|
||||
metadata: {get_param: ServerMetadata}
|
||||
metadata:
|
||||
map_merge:
|
||||
- {get_param: ServerMetadata}
|
||||
- {get_param: {{role}}ServerMetadata}
|
||||
scheduler_hints: {get_param: {{role}}SchedulerHints}
|
||||
|
||||
# Combine the NodeAdminUserData and NodeUserData mime archives
|
||||
|
|
Loading…
Reference in New Issue