Convert compute-role.yaml to role.role.j2.yaml
Add some special-casing for backwards compatibility, such that the Compute role can be rendered via j2 for support of composable networks. Change-Id: Ieee446583f77bb9423609d444c576788cf930121 Partially-Implements: blueprint composable-networks
This commit is contained in:
parent
1aad286ca3
commit
d8e2531820
|
@ -51,7 +51,7 @@ parameter_defaults:
|
||||||
- 172.16.0.251
|
- 172.16.0.251
|
||||||
#management:
|
#management:
|
||||||
#- 172.16.4.251
|
#- 172.16.4.251
|
||||||
NovaComputeIPs:
|
ComputeIPs:
|
||||||
# Each compute will get an IP from the lists below, first compute, first IP
|
# Each compute will get an IP from the lists below, first compute, first IP
|
||||||
internal_api:
|
internal_api:
|
||||||
- 172.16.2.252
|
- 172.16.2.252
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
# tripleo-common/tripleo_common/actions/templates.py
|
# tripleo-common/tripleo_common/actions/templates.py
|
||||||
|
|
||||||
name:
|
name:
|
||||||
- puppet/compute-role.yaml
|
|
||||||
- puppet/blockstorage-role.yaml
|
- puppet/blockstorage-role.yaml
|
||||||
- puppet/objectstorage-role.yaml
|
- puppet/objectstorage-role.yaml
|
||||||
- puppet/cephstorage-role.yaml
|
- puppet/cephstorage-role.yaml
|
||||||
|
|
|
@ -186,11 +186,12 @@ parameters:
|
||||||
|
|
||||||
{% if role.name != 'Compute' %}
|
{% if role.name != 'Compute' %}
|
||||||
{{role.name}}SchedulerHints:
|
{{role.name}}SchedulerHints:
|
||||||
|
description: Optional scheduler hints to pass to nova
|
||||||
{% else %}
|
{% else %}
|
||||||
NovaComputeSchedulerHints:
|
NovaComputeSchedulerHints:
|
||||||
|
description: DEPRECATED - use ComputeSchedulerHints instead
|
||||||
{% endif %}
|
{% endif %}
|
||||||
type: json
|
type: json
|
||||||
description: Optional scheduler hints to pass to nova
|
|
||||||
default: {}
|
default: {}
|
||||||
|
|
||||||
{{role.name}}Parameters:
|
{{role.name}}Parameters:
|
||||||
|
@ -224,13 +225,6 @@ parameters:
|
||||||
description: >
|
description: >
|
||||||
List of server hostnames to blacklist from any triggered deployments.
|
List of server hostnames to blacklist from any triggered deployments.
|
||||||
|
|
||||||
parameter_groups:
|
|
||||||
- label: deprecated
|
|
||||||
description: Do not use deprecated params, they will be removed.
|
|
||||||
parameters:
|
|
||||||
- controllerExtraConfig
|
|
||||||
- NovaComputeExtraConfig
|
|
||||||
|
|
||||||
conditions:
|
conditions:
|
||||||
add_vips_to_etc_hosts: {equals : [{get_param: AddVipsToEtcHosts}, True]}
|
add_vips_to_etc_hosts: {equals : [{get_param: AddVipsToEtcHosts}, True]}
|
||||||
|
|
||||||
|
|
|
@ -1,744 +0,0 @@
|
||||||
heat_template_version: pike
|
|
||||||
|
|
||||||
description: >
|
|
||||||
OpenStack hypervisor node configured via Puppet.
|
|
||||||
|
|
||||||
parameters:
|
|
||||||
ExtraConfig:
|
|
||||||
default: {}
|
|
||||||
description: |
|
|
||||||
Additional hiera configuration to inject into the cluster. Note
|
|
||||||
that NovaComputeExtraConfig takes precedence over ExtraConfig.
|
|
||||||
type: json
|
|
||||||
OvercloudComputeFlavor:
|
|
||||||
description: Flavor for the nova compute node
|
|
||||||
default: baremetal
|
|
||||||
type: string
|
|
||||||
constraints:
|
|
||||||
- custom_constraint: nova.flavor
|
|
||||||
NovaImage:
|
|
||||||
type: string
|
|
||||||
default: overcloud-full
|
|
||||||
constraints:
|
|
||||||
- custom_constraint: glance.image
|
|
||||||
ImageUpdatePolicy:
|
|
||||||
default: 'REBUILD_PRESERVE_EPHEMERAL'
|
|
||||||
description: What policy to use when reconstructing instances. REBUILD for rebuilds, REBUILD_PRESERVE_EPHEMERAL to preserve /mnt.
|
|
||||||
type: string
|
|
||||||
KeyName:
|
|
||||||
description: Name of an existing Nova key pair to enable SSH access to the instances
|
|
||||||
type: string
|
|
||||||
default: default
|
|
||||||
constraints:
|
|
||||||
- custom_constraint: nova.keypair
|
|
||||||
NeutronPhysicalBridge:
|
|
||||||
default: 'br-ex'
|
|
||||||
description: An OVS bridge to create for accessing external networks.
|
|
||||||
type: string
|
|
||||||
NeutronPublicInterface:
|
|
||||||
default: nic1
|
|
||||||
description: Which interface to add to the NeutronPhysicalBridge.
|
|
||||||
type: string
|
|
||||||
NodeIndex:
|
|
||||||
type: number
|
|
||||||
default: 0
|
|
||||||
NovaComputeExtraConfig:
|
|
||||||
default: {}
|
|
||||||
description: |
|
|
||||||
NovaCompute specific configuration to inject into the cluster. Same
|
|
||||||
structure as ExtraConfig.
|
|
||||||
type: json
|
|
||||||
NovaComputeIPs:
|
|
||||||
default: {}
|
|
||||||
type: json
|
|
||||||
ServiceNetMap:
|
|
||||||
default: {}
|
|
||||||
description: Mapping of service_name -> network name. Typically set
|
|
||||||
via parameter_defaults in the resource registry.
|
|
||||||
type: json
|
|
||||||
EndpointMap:
|
|
||||||
default: {}
|
|
||||||
description: Mapping of service endpoint -> protocol. Typically set
|
|
||||||
via parameter_defaults in the resource registry.
|
|
||||||
type: json
|
|
||||||
UpdateIdentifier:
|
|
||||||
default: ''
|
|
||||||
type: string
|
|
||||||
description: >
|
|
||||||
Setting to a previously unused value during stack-update will trigger
|
|
||||||
package update on all nodes
|
|
||||||
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: >
|
|
||||||
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: 'localdomain'
|
|
||||||
type: string
|
|
||||||
description: >
|
|
||||||
The DNS domain used for the hosts. This must match the
|
|
||||||
overcloud_domain_name configured on the undercloud.
|
|
||||||
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. This applies to
|
|
||||||
all roles and is merged with a role-specific metadata parameter.
|
|
||||||
type: json
|
|
||||||
NovaComputeSchedulerHints:
|
|
||||||
type: json
|
|
||||||
description: Optional scheduler hints to pass to nova
|
|
||||||
default: {}
|
|
||||||
ServiceConfigSettings:
|
|
||||||
type: json
|
|
||||||
default: {}
|
|
||||||
ServiceNames:
|
|
||||||
type: comma_delimited_list
|
|
||||||
default: []
|
|
||||||
MonitoringSubscriptions:
|
|
||||||
type: comma_delimited_list
|
|
||||||
default: []
|
|
||||||
ServiceMetadataSettings:
|
|
||||||
type: json
|
|
||||||
default: {}
|
|
||||||
ConfigCommand:
|
|
||||||
type: string
|
|
||||||
description: Command which will be run whenever configuration data changes
|
|
||||||
default: os-refresh-config --timeout 14400
|
|
||||||
ConfigCollectSplay:
|
|
||||||
type: number
|
|
||||||
default: 30
|
|
||||||
description: |
|
|
||||||
Maximum amount of time to possibly to delay configuation collection
|
|
||||||
polling. Defaults to 30 seconds. Set to 0 to disable it which will cause
|
|
||||||
the configuration collection to occur as soon as the collection process
|
|
||||||
starts. This setting is used to prevent the configuration collection
|
|
||||||
processes from polling all at the exact same time.
|
|
||||||
UpgradeInitCommand:
|
|
||||||
type: string
|
|
||||||
description: |
|
|
||||||
Command or script snippet to run on all overcloud nodes to
|
|
||||||
initialize the upgrade process. E.g. a repository switch.
|
|
||||||
default: ''
|
|
||||||
UpgradeInitCommonCommand:
|
|
||||||
type: string
|
|
||||||
description: |
|
|
||||||
Common commands required by the upgrades process. This should not
|
|
||||||
normally be modified by the operator and is set and unset in the
|
|
||||||
major-upgrade-composable-steps.yaml and major-upgrade-converge.yaml
|
|
||||||
environment files.
|
|
||||||
default: ''
|
|
||||||
DeploymentServerBlacklistDict:
|
|
||||||
default: {}
|
|
||||||
type: json
|
|
||||||
description: >
|
|
||||||
Map of server hostnames to blacklist from any triggered
|
|
||||||
deployments. If the value is 1, the server will be blacklisted. This
|
|
||||||
parameter is generated from the parent template.
|
|
||||||
RoleParameters:
|
|
||||||
type: json
|
|
||||||
description: Parameters specific to the role
|
|
||||||
default: {}
|
|
||||||
DeploymentSwiftDataMap:
|
|
||||||
type: json
|
|
||||||
description: |
|
|
||||||
Map of servers to Swift container and object for storing deployment data.
|
|
||||||
The keys are the Heat assigned hostnames, and the value is a map of the
|
|
||||||
container/object name in Swift. Example value:
|
|
||||||
overcloud-controller-0:
|
|
||||||
container: overcloud-controller
|
|
||||||
object: 0
|
|
||||||
overcloud-controller-1:
|
|
||||||
container: overcloud-controller
|
|
||||||
object: 1
|
|
||||||
overcloud-controller-2:
|
|
||||||
container: overcloud-controller
|
|
||||||
object: 2
|
|
||||||
overcloud-novacompute-0:
|
|
||||||
container: overcloud-compute
|
|
||||||
object: 0
|
|
||||||
default: {}
|
|
||||||
|
|
||||||
conditions:
|
|
||||||
deployment_swift_data_map_unset:
|
|
||||||
equals:
|
|
||||||
- get_param:
|
|
||||||
- DeploymentSwiftDataMap
|
|
||||||
- {get_param: Hostname}
|
|
||||||
- ""
|
|
||||||
server_not_blacklisted:
|
|
||||||
not:
|
|
||||||
equals:
|
|
||||||
- {get_param: [DeploymentServerBlacklistDict, {get_param: Hostname}]}
|
|
||||||
- 1
|
|
||||||
|
|
||||||
resources:
|
|
||||||
|
|
||||||
NovaCompute:
|
|
||||||
type: OS::TripleO::ComputeServer
|
|
||||||
metadata:
|
|
||||||
os-collect-config:
|
|
||||||
command: {get_param: ConfigCommand}
|
|
||||||
splay: {get_param: ConfigCollectSplay}
|
|
||||||
properties:
|
|
||||||
image: {get_param: NovaImage}
|
|
||||||
image_update_policy:
|
|
||||||
get_param: ImageUpdatePolicy
|
|
||||||
flavor: {get_param: OvercloudComputeFlavor}
|
|
||||||
key_name: {get_param: KeyName}
|
|
||||||
networks:
|
|
||||||
- network: ctlplane
|
|
||||||
user_data_format: SOFTWARE_CONFIG
|
|
||||||
user_data: {get_resource: UserData}
|
|
||||||
name:
|
|
||||||
str_replace:
|
|
||||||
template: {get_param: Hostname}
|
|
||||||
params: {get_param: HostnameMap}
|
|
||||||
software_config_transport: {get_param: SoftwareConfigTransport}
|
|
||||||
metadata:
|
|
||||||
map_merge:
|
|
||||||
- {get_param: ServerMetadata}
|
|
||||||
- {get_param: NovaComputeServerMetadata}
|
|
||||||
- {get_param: ServiceMetadataSettings}
|
|
||||||
scheduler_hints: {get_param: NovaComputeSchedulerHints}
|
|
||||||
deployment_swift_data:
|
|
||||||
if:
|
|
||||||
- deployment_swift_data_map_unset
|
|
||||||
- {}
|
|
||||||
- {get_param: [DeploymentSwiftDataMap,
|
|
||||||
{get_param: Hostname}]}
|
|
||||||
|
|
||||||
# Combine the NodeAdminUserData and NodeUserData mime archives
|
|
||||||
UserData:
|
|
||||||
type: OS::Heat::MultipartMime
|
|
||||||
properties:
|
|
||||||
parts:
|
|
||||||
- config: {get_resource: NodeAdminUserData}
|
|
||||||
type: multipart
|
|
||||||
- config: {get_resource: NodeUserData}
|
|
||||||
type: multipart
|
|
||||||
- config: {get_resource: RoleUserData}
|
|
||||||
type: multipart
|
|
||||||
|
|
||||||
# Creates the "heat-admin" user if configured via the environment
|
|
||||||
# Should return a OS::Heat::MultipartMime reference via OS::stack_id
|
|
||||||
NodeAdminUserData:
|
|
||||||
type: OS::TripleO::NodeAdminUserData
|
|
||||||
|
|
||||||
# For optional operator additional userdata
|
|
||||||
# Should return a OS::Heat::MultipartMime reference via OS::stack_id
|
|
||||||
NodeUserData:
|
|
||||||
type: OS::TripleO::NodeUserData
|
|
||||||
|
|
||||||
# For optional operator role-specific userdata
|
|
||||||
# Should return a OS::Heat::MultipartMime reference via OS::stack_id
|
|
||||||
RoleUserData:
|
|
||||||
type: OS::TripleO::Compute::NodeUserData
|
|
||||||
|
|
||||||
ExternalPort:
|
|
||||||
type: OS::TripleO::Compute::Ports::ExternalPort
|
|
||||||
properties:
|
|
||||||
ControlPlaneIP: {get_attr: [NovaCompute, networks, ctlplane, 0]}
|
|
||||||
IPPool: {get_param: NovaComputeIPs}
|
|
||||||
NodeIndex: {get_param: NodeIndex}
|
|
||||||
|
|
||||||
InternalApiPort:
|
|
||||||
type: OS::TripleO::Compute::Ports::InternalApiPort
|
|
||||||
properties:
|
|
||||||
ControlPlaneIP: {get_attr: [NovaCompute, networks, ctlplane, 0]}
|
|
||||||
IPPool: {get_param: NovaComputeIPs}
|
|
||||||
NodeIndex: {get_param: NodeIndex}
|
|
||||||
|
|
||||||
StoragePort:
|
|
||||||
type: OS::TripleO::Compute::Ports::StoragePort
|
|
||||||
properties:
|
|
||||||
ControlPlaneIP: {get_attr: [NovaCompute, networks, ctlplane, 0]}
|
|
||||||
IPPool: {get_param: NovaComputeIPs}
|
|
||||||
NodeIndex: {get_param: NodeIndex}
|
|
||||||
|
|
||||||
StorageMgmtPort:
|
|
||||||
type: OS::TripleO::Compute::Ports::StorageMgmtPort
|
|
||||||
properties:
|
|
||||||
ControlPlaneIP: {get_attr: [NovaCompute, networks, ctlplane, 0]}
|
|
||||||
IPPool: {get_param: NovaComputeIPs}
|
|
||||||
NodeIndex: {get_param: NodeIndex}
|
|
||||||
|
|
||||||
TenantPort:
|
|
||||||
type: OS::TripleO::Compute::Ports::TenantPort
|
|
||||||
properties:
|
|
||||||
ControlPlaneIP: {get_attr: [NovaCompute, networks, ctlplane, 0]}
|
|
||||||
IPPool: {get_param: NovaComputeIPs}
|
|
||||||
NodeIndex: {get_param: NodeIndex}
|
|
||||||
|
|
||||||
ManagementPort:
|
|
||||||
type: OS::TripleO::Compute::Ports::ManagementPort
|
|
||||||
properties:
|
|
||||||
ControlPlaneIP: {get_attr: [NovaCompute, networks, ctlplane, 0]}
|
|
||||||
IPPool: {get_param: NovaComputeIPs}
|
|
||||||
NodeIndex: {get_param: NodeIndex}
|
|
||||||
|
|
||||||
NetIpMap:
|
|
||||||
type: OS::TripleO::Network::Ports::NetIpMap
|
|
||||||
properties:
|
|
||||||
ControlPlaneIp: {get_attr: [NovaCompute, networks, ctlplane, 0]}
|
|
||||||
ExternalIp: {get_attr: [ExternalPort, ip_address]}
|
|
||||||
ExternalIpSubnet: {get_attr: [ExternalPort, ip_subnet]}
|
|
||||||
ExternalIpUri: {get_attr: [ExternalPort, ip_address_uri]}
|
|
||||||
InternalApiIp: {get_attr: [InternalApiPort, ip_address]}
|
|
||||||
InternalApiIpSubnet: {get_attr: [InternalApiPort, ip_subnet]}
|
|
||||||
InternalApiIpUri: {get_attr: [InternalApiPort, ip_address_uri]}
|
|
||||||
StorageIp: {get_attr: [StoragePort, ip_address]}
|
|
||||||
StorageIpSubnet: {get_attr: [StoragePort, ip_subnet]}
|
|
||||||
StorageIpUri: {get_attr: [StoragePort, ip_address_uri]}
|
|
||||||
StorageMgmtIp: {get_attr: [StorageMgmtPort, ip_address]}
|
|
||||||
StorageMgmtIpSubnet: {get_attr: [StorageMgmtPort, ip_subnet]}
|
|
||||||
StorageMgmtIpUri: {get_attr: [StorageMgmtPort, ip_address_uri]}
|
|
||||||
TenantIp: {get_attr: [TenantPort, ip_address]}
|
|
||||||
TenantIpSubnet: {get_attr: [TenantPort, ip_subnet]}
|
|
||||||
TenantIpUri: {get_attr: [TenantPort, ip_address_uri]}
|
|
||||||
ManagementIp: {get_attr: [ManagementPort, ip_address]}
|
|
||||||
ManagementIpSubnet: {get_attr: [ManagementPort, ip_subnet]}
|
|
||||||
ManagementIpUri: {get_attr: [ManagementPort, ip_address_uri]}
|
|
||||||
|
|
||||||
NetHostMap:
|
|
||||||
type: OS::Heat::Value
|
|
||||||
properties:
|
|
||||||
type: json
|
|
||||||
value:
|
|
||||||
external:
|
|
||||||
fqdn:
|
|
||||||
list_join:
|
|
||||||
- '.'
|
|
||||||
- - {get_attr: [NovaCompute, name]}
|
|
||||||
- external
|
|
||||||
- {get_param: CloudDomain}
|
|
||||||
short:
|
|
||||||
list_join:
|
|
||||||
- '.'
|
|
||||||
- - {get_attr: [NovaCompute, name]}
|
|
||||||
- external
|
|
||||||
internal_api:
|
|
||||||
fqdn:
|
|
||||||
list_join:
|
|
||||||
- '.'
|
|
||||||
- - {get_attr: [NovaCompute, name]}
|
|
||||||
- internalapi
|
|
||||||
- {get_param: CloudDomain}
|
|
||||||
short:
|
|
||||||
list_join:
|
|
||||||
- '.'
|
|
||||||
- - {get_attr: [NovaCompute, name]}
|
|
||||||
- internalapi
|
|
||||||
storage:
|
|
||||||
fqdn:
|
|
||||||
list_join:
|
|
||||||
- '.'
|
|
||||||
- - {get_attr: [NovaCompute, name]}
|
|
||||||
- storage
|
|
||||||
- {get_param: CloudDomain}
|
|
||||||
short:
|
|
||||||
list_join:
|
|
||||||
- '.'
|
|
||||||
- - {get_attr: [NovaCompute, name]}
|
|
||||||
- storage
|
|
||||||
storage_mgmt:
|
|
||||||
fqdn:
|
|
||||||
list_join:
|
|
||||||
- '.'
|
|
||||||
- - {get_attr: [NovaCompute, name]}
|
|
||||||
- storagemgmt
|
|
||||||
- {get_param: CloudDomain}
|
|
||||||
short:
|
|
||||||
list_join:
|
|
||||||
- '.'
|
|
||||||
- - {get_attr: [NovaCompute, name]}
|
|
||||||
- storagemgmt
|
|
||||||
tenant:
|
|
||||||
fqdn:
|
|
||||||
list_join:
|
|
||||||
- '.'
|
|
||||||
- - {get_attr: [NovaCompute, name]}
|
|
||||||
- tenant
|
|
||||||
- {get_param: CloudDomain}
|
|
||||||
short:
|
|
||||||
list_join:
|
|
||||||
- '.'
|
|
||||||
- - {get_attr: [NovaCompute, name]}
|
|
||||||
- tenant
|
|
||||||
management:
|
|
||||||
fqdn:
|
|
||||||
list_join:
|
|
||||||
- '.'
|
|
||||||
- - {get_attr: [NovaCompute, name]}
|
|
||||||
- management
|
|
||||||
- {get_param: CloudDomain}
|
|
||||||
short:
|
|
||||||
list_join:
|
|
||||||
- '.'
|
|
||||||
- - {get_attr: [NovaCompute, name]}
|
|
||||||
- management
|
|
||||||
ctlplane:
|
|
||||||
fqdn:
|
|
||||||
list_join:
|
|
||||||
- '.'
|
|
||||||
- - {get_attr: [NovaCompute, name]}
|
|
||||||
- ctlplane
|
|
||||||
- {get_param: CloudDomain}
|
|
||||||
short:
|
|
||||||
list_join:
|
|
||||||
- '.'
|
|
||||||
- - {get_attr: [NovaCompute, name]}
|
|
||||||
- ctlplane
|
|
||||||
|
|
||||||
PreNetworkConfig:
|
|
||||||
type: OS::TripleO::Compute::PreNetworkConfig
|
|
||||||
properties:
|
|
||||||
server: {get_resource: NovaCompute}
|
|
||||||
RoleParameters: {get_param: RoleParameters}
|
|
||||||
ServiceNames: {get_param: ServiceNames}
|
|
||||||
deployment_actions: {get_attr: [DeploymentActions, value]}
|
|
||||||
|
|
||||||
NetworkConfig:
|
|
||||||
type: OS::TripleO::Compute::Net::SoftwareConfig
|
|
||||||
properties:
|
|
||||||
ControlPlaneIp: {get_attr: [NovaCompute, networks, ctlplane, 0]}
|
|
||||||
ExternalIpSubnet: {get_attr: [ExternalPort, ip_subnet]}
|
|
||||||
InternalApiIpSubnet: {get_attr: [InternalApiPort, ip_subnet]}
|
|
||||||
StorageIpSubnet: {get_attr: [StoragePort, ip_subnet]}
|
|
||||||
StorageMgmtIpSubnet: {get_attr: [StorageMgmtPort, ip_subnet]}
|
|
||||||
TenantIpSubnet: {get_attr: [TenantPort, ip_subnet]}
|
|
||||||
ManagementIpSubnet: {get_attr: [ManagementPort, ip_subnet]}
|
|
||||||
|
|
||||||
NetworkDeployment:
|
|
||||||
type: OS::TripleO::SoftwareDeployment
|
|
||||||
depends_on: PreNetworkConfig
|
|
||||||
properties:
|
|
||||||
name: NetworkDeployment
|
|
||||||
actions:
|
|
||||||
if:
|
|
||||||
- server_not_blacklisted
|
|
||||||
- {get_param: NetworkDeploymentActions}
|
|
||||||
- []
|
|
||||||
config: {get_resource: NetworkConfig}
|
|
||||||
server: {get_resource: NovaCompute}
|
|
||||||
input_values:
|
|
||||||
bridge_name: {get_param: NeutronPhysicalBridge}
|
|
||||||
interface_name: {get_param: NeutronPublicInterface}
|
|
||||||
|
|
||||||
NovaComputeUpgradeInitConfig:
|
|
||||||
type: OS::Heat::SoftwareConfig
|
|
||||||
properties:
|
|
||||||
group: script
|
|
||||||
config:
|
|
||||||
list_join:
|
|
||||||
- ''
|
|
||||||
- - "#!/bin/bash\n\n"
|
|
||||||
- "if [[ -f /etc/resolv.conf.save ]] ; then rm /etc/resolv.conf.save; fi\n\n"
|
|
||||||
- get_param: UpgradeInitCommand
|
|
||||||
- get_param: UpgradeInitCommonCommand
|
|
||||||
|
|
||||||
# Note we may be able to make this conditional on UpgradeInitCommandNotEmpty
|
|
||||||
# but https://bugs.launchpad.net/heat/+bug/1649900 needs fixing first
|
|
||||||
NovaComputeUpgradeInitDeployment:
|
|
||||||
type: OS::Heat::SoftwareDeployment
|
|
||||||
depends_on: NetworkDeployment
|
|
||||||
properties:
|
|
||||||
name: NovaComputeUpgradeInitDeployment
|
|
||||||
actions:
|
|
||||||
if:
|
|
||||||
- server_not_blacklisted
|
|
||||||
- ['CREATE', 'UPDATE']
|
|
||||||
- []
|
|
||||||
server: {get_resource: NovaCompute}
|
|
||||||
config: {get_resource: NovaComputeUpgradeInitConfig}
|
|
||||||
|
|
||||||
NovaComputeConfig:
|
|
||||||
type: OS::Heat::StructuredConfig
|
|
||||||
properties:
|
|
||||||
group: hiera
|
|
||||||
config:
|
|
||||||
hierarchy:
|
|
||||||
- '"%{::uuid}"'
|
|
||||||
- heat_config_%{::deploy_config_name}
|
|
||||||
- config_step
|
|
||||||
- compute_extraconfig
|
|
||||||
- extraconfig
|
|
||||||
- service_names
|
|
||||||
- service_configs
|
|
||||||
- compute
|
|
||||||
- bootstrap_node # provided by allNodesConfig
|
|
||||||
- all_nodes # provided by allNodesConfig
|
|
||||||
- vip_data # provided by allNodesConfig
|
|
||||||
- '"%{::osfamily}"'
|
|
||||||
- neutron_bigswitch_data # Optionally provided by ComputeExtraConfigPre
|
|
||||||
- cisco_n1kv_data # Optionally provided by ComputeExtraConfigPre
|
|
||||||
- nova_nuage_data # Optionally provided by ComputeExtraConfigPre
|
|
||||||
- midonet_data # Optionally provided by AllNodesExtraConfig
|
|
||||||
- neutron_opencontrail_data # Optionally provided by ComputeExtraConfigPre
|
|
||||||
- cisco_aci_data # Optionally provided by ComputeExtraConfigPre
|
|
||||||
merge_behavior: deeper
|
|
||||||
datafiles:
|
|
||||||
service_names:
|
|
||||||
service_names: {get_param: ServiceNames}
|
|
||||||
sensu::subscriptions: {get_param: MonitoringSubscriptions}
|
|
||||||
service_configs:
|
|
||||||
map_replace:
|
|
||||||
- {get_param: ServiceConfigSettings}
|
|
||||||
- values: {get_attr: [NetIpMap, net_ip_map]}
|
|
||||||
compute_extraconfig: {get_param: NovaComputeExtraConfig}
|
|
||||||
extraconfig: {get_param: ExtraConfig}
|
|
||||||
compute:
|
|
||||||
tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}
|
|
||||||
fqdn_internal_api: {get_attr: [NetHostMap, value, internal_api, fqdn]}
|
|
||||||
fqdn_storage: {get_attr: [NetHostMap, value, storage, fqdn]}
|
|
||||||
fqdn_storage_mgmt: {get_attr: [NetHostMap, value, storage_mgmt, fqdn]}
|
|
||||||
fqdn_tenant: {get_attr: [NetHostMap, value, tenant, fqdn]}
|
|
||||||
fqdn_management: {get_attr: [NetHostMap, value, management, fqdn]}
|
|
||||||
fqdn_ctlplane: {get_attr: [NetHostMap, value, ctlplane, fqdn]}
|
|
||||||
fqdn_external: {get_attr: [NetHostMap, value, external, fqdn]}
|
|
||||||
|
|
||||||
NovaComputeDeployment:
|
|
||||||
type: OS::TripleO::SoftwareDeployment
|
|
||||||
depends_on: NovaComputeUpgradeInitDeployment
|
|
||||||
properties:
|
|
||||||
name: NovaComputeDeployment
|
|
||||||
actions:
|
|
||||||
if:
|
|
||||||
- server_not_blacklisted
|
|
||||||
- ['CREATE', 'UPDATE']
|
|
||||||
- []
|
|
||||||
config: {get_resource: NovaComputeConfig}
|
|
||||||
server: {get_resource: NovaCompute}
|
|
||||||
input_values:
|
|
||||||
enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
|
|
||||||
|
|
||||||
# Resource for site-specific injection of root certificate
|
|
||||||
NodeTLSCAData:
|
|
||||||
depends_on: NovaComputeDeployment
|
|
||||||
type: OS::TripleO::NodeTLSCAData
|
|
||||||
properties:
|
|
||||||
server: {get_resource: NovaCompute}
|
|
||||||
|
|
||||||
# Hook for site-specific additional pre-deployment config, e.g extra hieradata
|
|
||||||
ComputeExtraConfigPre:
|
|
||||||
depends_on: NovaComputeDeployment
|
|
||||||
type: OS::TripleO::ComputeExtraConfigPre
|
|
||||||
# We have to use conditions here so that we don't break backwards
|
|
||||||
# compatibility with templates everywhere
|
|
||||||
condition: server_not_blacklisted
|
|
||||||
properties:
|
|
||||||
server: {get_resource: NovaCompute}
|
|
||||||
|
|
||||||
# Hook for site-specific additional pre-deployment config,
|
|
||||||
# applying to all nodes, e.g node registration/unregistration
|
|
||||||
NodeExtraConfig:
|
|
||||||
depends_on: [ComputeExtraConfigPre, NodeTLSCAData]
|
|
||||||
type: OS::TripleO::NodeExtraConfig
|
|
||||||
# We have to use conditions here so that we don't break backwards
|
|
||||||
# compatibility with templates everywhere
|
|
||||||
condition: server_not_blacklisted
|
|
||||||
properties:
|
|
||||||
server: {get_resource: NovaCompute}
|
|
||||||
|
|
||||||
UpdateConfig:
|
|
||||||
type: OS::TripleO::Tasks::PackageUpdate
|
|
||||||
|
|
||||||
UpdateDeployment:
|
|
||||||
type: OS::Heat::SoftwareDeployment
|
|
||||||
depends_on: NetworkDeployment
|
|
||||||
properties:
|
|
||||||
name: UpdateDeployment
|
|
||||||
actions:
|
|
||||||
if:
|
|
||||||
- server_not_blacklisted
|
|
||||||
- ['CREATE', 'UPDATE']
|
|
||||||
- []
|
|
||||||
config: {get_resource: UpdateConfig}
|
|
||||||
server: {get_resource: NovaCompute}
|
|
||||||
input_values:
|
|
||||||
update_identifier:
|
|
||||||
get_param: UpdateIdentifier
|
|
||||||
|
|
||||||
DeploymentActions:
|
|
||||||
type: OS::Heat::Value
|
|
||||||
properties:
|
|
||||||
value:
|
|
||||||
if:
|
|
||||||
- server_not_blacklisted
|
|
||||||
- ['CREATE', 'UPDATE']
|
|
||||||
- []
|
|
||||||
|
|
||||||
SshHostPubKey:
|
|
||||||
type: OS::TripleO::Ssh::HostPubKey
|
|
||||||
depends_on: NovaComputeDeployment
|
|
||||||
properties:
|
|
||||||
server: {get_resource: NovaCompute}
|
|
||||||
deployment_actions: {get_attr: [DeploymentActions, value]}
|
|
||||||
|
|
||||||
outputs:
|
|
||||||
ip_address:
|
|
||||||
description: IP address of the server in the ctlplane network
|
|
||||||
value: {get_attr: [NovaCompute, networks, ctlplane, 0]}
|
|
||||||
external_ip_address:
|
|
||||||
description: IP address of the server in the external network
|
|
||||||
value: {get_attr: [ExternalPort, ip_address]}
|
|
||||||
internal_api_ip_address:
|
|
||||||
description: IP address of the server in the internal_api network
|
|
||||||
value: {get_attr: [InternalApiPort, ip_address]}
|
|
||||||
storage_ip_address:
|
|
||||||
description: IP address of the server in the storage network
|
|
||||||
value: {get_attr: [StoragePort, ip_address]}
|
|
||||||
storage_mgmt_ip_address:
|
|
||||||
description: IP address of the server in the storage_mgmt network
|
|
||||||
value: {get_attr: [StorageMgmtPort, ip_address]}
|
|
||||||
tenant_ip_address:
|
|
||||||
description: IP address of the server in the tenant network
|
|
||||||
value: {get_attr: [TenantPort, ip_address]}
|
|
||||||
management_ip_address:
|
|
||||||
description: IP address of the server in the management network
|
|
||||||
value: {get_attr: [ManagementPort, ip_address]}
|
|
||||||
deployed_server_port_map:
|
|
||||||
description: |
|
|
||||||
Map of Heat created hostname of the server to ip address. This is the
|
|
||||||
hostname before it has been mapped with the HostnameMap parameter, and
|
|
||||||
the IP address from the ctlplane network. This map can be used to construct
|
|
||||||
the DeployedServerPortMap parameter when using split-stack.
|
|
||||||
value:
|
|
||||||
map_replace:
|
|
||||||
- hostname:
|
|
||||||
fixed_ips:
|
|
||||||
- ip_address: {get_attr: [NovaCompute, networks, ctlplane, 0]}
|
|
||||||
- keys:
|
|
||||||
hostname:
|
|
||||||
list_join:
|
|
||||||
- '-'
|
|
||||||
- - {get_param: Hostname}
|
|
||||||
- ctlplane
|
|
||||||
deployed_server_deployment_swift_data_map:
|
|
||||||
description:
|
|
||||||
Map of Heat created hostname of the server to the Swift container and object
|
|
||||||
used to created the temporary url for metadata polling with
|
|
||||||
os-collect-config.
|
|
||||||
value:
|
|
||||||
map_replace:
|
|
||||||
- hostname:
|
|
||||||
container:
|
|
||||||
str_split:
|
|
||||||
- '/'
|
|
||||||
- {get_attr: [NovaCompute, os_collect_config, request, metadata_url]}
|
|
||||||
- 5
|
|
||||||
object:
|
|
||||||
str_split:
|
|
||||||
- '?'
|
|
||||||
- str_split:
|
|
||||||
- '/'
|
|
||||||
- {get_attr: [NovaCompute, os_collect_config, request, metadata_url]}
|
|
||||||
- 6
|
|
||||||
- 0
|
|
||||||
- keys: {hostname: {get_param: Hostname}}
|
|
||||||
hostname:
|
|
||||||
description: Hostname of the server
|
|
||||||
value: {get_attr: [NovaCompute, name]}
|
|
||||||
hostname_map:
|
|
||||||
description: Mapping of network names to hostnames
|
|
||||||
value:
|
|
||||||
external: {get_attr: [NetHostMap, value, external, fqdn]}
|
|
||||||
internal_api: {get_attr: [NetHostMap, value, internal_api, fqdn]}
|
|
||||||
storage: {get_attr: [NetHostMap, value, storage, fqdn]}
|
|
||||||
storage_mgmt: {get_attr: [NetHostMap, value, storage_mgmt, fqdn]}
|
|
||||||
tenant: {get_attr: [NetHostMap, value, tenant, fqdn]}
|
|
||||||
management: {get_attr: [NetHostMap, value, management, fqdn]}
|
|
||||||
ctlplane: {get_attr: [NetHostMap, value, ctlplane, fqdn]}
|
|
||||||
hosts_entry:
|
|
||||||
description: >
|
|
||||||
Server's IP address and hostname in the /etc/hosts format
|
|
||||||
value:
|
|
||||||
str_replace:
|
|
||||||
template: |
|
|
||||||
PRIMARYIP PRIMARYHOST.DOMAIN PRIMARYHOST
|
|
||||||
EXTERNALIP EXTERNALHOST.DOMAIN EXTERNALHOST
|
|
||||||
INTERNAL_APIIP INTERNAL_APIHOST.DOMAIN INTERNAL_APIHOST
|
|
||||||
STORAGEIP STORAGEHOST.DOMAIN STORAGEHOST
|
|
||||||
STORAGE_MGMTIP STORAGE_MGMTHOST.DOMAIN STORAGE_MGMTHOST
|
|
||||||
TENANTIP TENANTHOST.DOMAIN TENANTHOST
|
|
||||||
MANAGEMENTIP MANAGEMENTHOST.DOMAIN MANAGEMENTHOST
|
|
||||||
CTLPLANEIP CTLPLANEHOST.DOMAIN CTLPLANEHOST
|
|
||||||
params:
|
|
||||||
PRIMARYIP: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, ComputeHostnameResolveNetwork]}]}
|
|
||||||
DOMAIN: {get_param: CloudDomain}
|
|
||||||
PRIMARYHOST: {get_attr: [NovaCompute, name]}
|
|
||||||
EXTERNALIP: {get_attr: [ExternalPort, ip_address]}
|
|
||||||
EXTERNALHOST: {get_attr: [NetHostMap, value, external, short]}
|
|
||||||
INTERNAL_APIIP: {get_attr: [InternalApiPort, ip_address]}
|
|
||||||
INTERNAL_APIHOST: {get_attr: [NetHostMap, value, internal_api, short]}
|
|
||||||
STORAGEIP: {get_attr: [StoragePort, ip_address]}
|
|
||||||
STORAGEHOST: {get_attr: [NetHostMap, value, storage, short]}
|
|
||||||
STORAGE_MGMTIP: {get_attr: [StorageMgmtPort, ip_address]}
|
|
||||||
STORAGE_MGMTHOST: {get_attr: [NetHostMap, value, storage_mgmt, short]}
|
|
||||||
TENANTIP: {get_attr: [TenantPort, ip_address]}
|
|
||||||
TENANTHOST: {get_attr: [NetHostMap, value, tenant, short]}
|
|
||||||
MANAGEMENTIP: {get_attr: [ManagementPort, ip_address]}
|
|
||||||
MANAGEMENTHOST: {get_attr: [NetHostMap, value, management, short]}
|
|
||||||
CTLPLANEIP: {get_attr: [NovaCompute, networks, ctlplane, 0]}
|
|
||||||
CTLPLANEHOST: {get_attr: [NetHostMap, value, ctlplane, short]}
|
|
||||||
known_hosts_entry:
|
|
||||||
description: Entry for ssh known hosts
|
|
||||||
value:
|
|
||||||
str_replace:
|
|
||||||
template: "PRIMARYIP,PRIMARYHOST.DOMAIN,PRIMARYHOST,\
|
|
||||||
EXTERNALIP,EXTERNALHOST.DOMAIN,EXTERNALHOST,\
|
|
||||||
INTERNAL_APIIP,INTERNAL_APIHOST.DOMAIN,INTERNAL_APIHOST,\
|
|
||||||
STORAGEIP,STORAGEHOST.DOMAIN,STORAGEHOST,\
|
|
||||||
STORAGE_MGMTIP,STORAGE_MGMTHOST.DOMAIN,STORAGE_MGMTHOST,\
|
|
||||||
TENANTIP,TENANTHOST.DOMAIN,TENANTHOST,\
|
|
||||||
MANAGEMENTIP,MANAGEMENTHOST.DOMAIN,MANAGEMENTHOST,\
|
|
||||||
CTLPLANEIP,CTLPLANEHOST.DOMAIN,CTLPLANEHOST HOSTSSHPUBKEY"
|
|
||||||
params:
|
|
||||||
PRIMARYIP: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, ComputeHostnameResolveNetwork]}]}
|
|
||||||
DOMAIN: {get_param: CloudDomain}
|
|
||||||
PRIMARYHOST: {get_attr: [NovaCompute, name]}
|
|
||||||
EXTERNALIP: {get_attr: [ExternalPort, ip_address]}
|
|
||||||
EXTERNALHOST: {get_attr: [NetHostMap, value, external, short]}
|
|
||||||
INTERNAL_APIIP: {get_attr: [InternalApiPort, ip_address]}
|
|
||||||
INTERNAL_APIHOST: {get_attr: [NetHostMap, value, internal_api, short]}
|
|
||||||
STORAGEIP: {get_attr: [StoragePort, ip_address]}
|
|
||||||
STORAGEHOST: {get_attr: [NetHostMap, value, storage, short]}
|
|
||||||
STORAGE_MGMTIP: {get_attr: [StorageMgmtPort, ip_address]}
|
|
||||||
STORAGE_MGMTHOST: {get_attr: [NetHostMap, value, storage_mgmt, short]}
|
|
||||||
TENANTIP: {get_attr: [TenantPort, ip_address]}
|
|
||||||
TENANTHOST: {get_attr: [NetHostMap, value, tenant, short]}
|
|
||||||
MANAGEMENTIP: {get_attr: [ManagementPort, ip_address]}
|
|
||||||
MANAGEMENTHOST: {get_attr: [NetHostMap, value, management, short]}
|
|
||||||
CTLPLANEIP: {get_attr: [NovaCompute, networks, ctlplane, 0]}
|
|
||||||
CTLPLANEHOST: {get_attr: [NetHostMap, value, ctlplane, short]}
|
|
||||||
HOSTSSHPUBKEY: {get_attr: [SshHostPubKey, ecdsa]}
|
|
||||||
nova_server_resource:
|
|
||||||
description: Heat resource handle for the Nova compute server
|
|
||||||
value:
|
|
||||||
{get_resource: NovaCompute}
|
|
||||||
condition: server_not_blacklisted
|
|
||||||
os_collect_config:
|
|
||||||
description: The os-collect-config configuration associated with this server resource
|
|
||||||
value: {get_attr: [NovaCompute, os_collect_config]}
|
|
|
@ -131,6 +131,12 @@ parameters:
|
||||||
role-specific and is merged with the values given to the ServerMetadata
|
role-specific and is merged with the values given to the ServerMetadata
|
||||||
parameter.
|
parameter.
|
||||||
type: json
|
type: json
|
||||||
|
{%- if role.deprecated_param_metadata is defined %}
|
||||||
|
{{role.deprecated_param_metadata}}:
|
||||||
|
default: {}
|
||||||
|
description: DEPRECATED - use {{role.name}}ServerMetadata instead
|
||||||
|
type: json
|
||||||
|
{%- endif %}
|
||||||
ServerMetadata:
|
ServerMetadata:
|
||||||
default: {}
|
default: {}
|
||||||
description: >
|
description: >
|
||||||
|
@ -142,6 +148,12 @@ parameters:
|
||||||
type: json
|
type: json
|
||||||
description: Optional scheduler hints to pass to nova
|
description: Optional scheduler hints to pass to nova
|
||||||
default: {}
|
default: {}
|
||||||
|
{%- if role.deprecated_param_scheduler_hints is defined %}
|
||||||
|
{{role.deprecated_param_scheduler_hints}}:
|
||||||
|
type: json
|
||||||
|
description: DEPRECATED - use {{role.name}}SchedulerHints instead
|
||||||
|
default: {}
|
||||||
|
{%- endif %}
|
||||||
NodeIndex:
|
NodeIndex:
|
||||||
type: number
|
type: number
|
||||||
default: 0
|
default: 0
|
||||||
|
@ -245,7 +257,6 @@ conditions:
|
||||||
- DeploymentSwiftDataMap
|
- DeploymentSwiftDataMap
|
||||||
- {get_param: Hostname}
|
- {get_param: Hostname}
|
||||||
- ""
|
- ""
|
||||||
|
|
||||||
{%- if role.deprecated_param_image is defined %}
|
{%- if role.deprecated_param_image is defined %}
|
||||||
deprecated_param_image_set:
|
deprecated_param_image_set:
|
||||||
not:
|
not:
|
||||||
|
@ -301,9 +312,17 @@ resources:
|
||||||
metadata:
|
metadata:
|
||||||
map_merge:
|
map_merge:
|
||||||
- {get_param: ServerMetadata}
|
- {get_param: ServerMetadata}
|
||||||
|
{%- if role.deprecated_param_metadata is defined %}
|
||||||
|
- {get_param: {{role.deprecated_param_metadata}}}
|
||||||
|
{%- endif %}
|
||||||
- {get_param: {{role.name}}ServerMetadata}
|
- {get_param: {{role.name}}ServerMetadata}
|
||||||
- {get_param: ServiceMetadataSettings}
|
- {get_param: ServiceMetadataSettings}
|
||||||
scheduler_hints: {get_param: {{role.name}}SchedulerHints}
|
scheduler_hints:
|
||||||
|
map_merge:
|
||||||
|
{%- if role.deprecated_param_scheduler_hints is defined %}
|
||||||
|
- {get_param: {{role.deprecated_param_scheduler_hints}}}
|
||||||
|
{%- endif %}
|
||||||
|
- {get_param: {{role.name}}SchedulerHints}
|
||||||
deployment_swift_data:
|
deployment_swift_data:
|
||||||
if:
|
if:
|
||||||
- deployment_swift_data_map_unset
|
- deployment_swift_data_map_unset
|
||||||
|
@ -343,7 +362,12 @@ resources:
|
||||||
type: OS::TripleO::{{role.name}}::Ports::{{network.name}}Port
|
type: OS::TripleO::{{role.name}}::Ports::{{network.name}}Port
|
||||||
properties:
|
properties:
|
||||||
ControlPlaneIP: {get_attr: [{{server_resource_name}}, networks, ctlplane, 0]}
|
ControlPlaneIP: {get_attr: [{{server_resource_name}}, networks, ctlplane, 0]}
|
||||||
IPPool: {get_param: {{server_resource_name}}IPs}
|
IPPool:
|
||||||
|
map_merge:
|
||||||
|
{%- if role.deprecated_param_ips is defined %}
|
||||||
|
- {get_param: {{role.deprecated_param_ips}}}
|
||||||
|
{%- endif %}
|
||||||
|
- {get_param: {{role.name}}IPs}
|
||||||
NodeIndex: {get_param: NodeIndex}
|
NodeIndex: {get_param: NodeIndex}
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,9 @@
|
||||||
|
---
|
||||||
|
deprecations:
|
||||||
|
- |
|
||||||
|
The following parameters are deprecated for the Compute role:
|
||||||
|
NovaComputeSchedulerHints - use ComputeSchedulerHints instead
|
||||||
|
NovaComputeServerMetadata - use ComputeServerMetadata instead
|
||||||
|
NovaComputeExtraConfig - use ComputeExtraConfig instead
|
||||||
|
NovaComputeIPs - use ComputeIPs instead
|
||||||
|
NovaImage - Use OvercloudComputeImage instead
|
|
@ -10,6 +10,15 @@
|
||||||
- Tenant
|
- Tenant
|
||||||
- Storage
|
- Storage
|
||||||
HostnameFormatDefault: '%stackname%-novacompute-%index%'
|
HostnameFormatDefault: '%stackname%-novacompute-%index%'
|
||||||
|
# Deprecated & backward-compatible values (FIXME: Make parameters consistent)
|
||||||
|
# Set uses_deprecated_params to True if any deprecated params are used.
|
||||||
|
uses_deprecated_params: True
|
||||||
|
deprecated_param_image: 'NovaImage'
|
||||||
|
deprecated_param_extraconfig: 'NovaComputeExtraConfig'
|
||||||
|
deprecated_param_metadata: 'NovaComputeServerMetadata'
|
||||||
|
deprecated_param_scheduler_hints: 'NovaComputeSchedulerHints'
|
||||||
|
deprecated_param_ips: 'NovaComputeIPs'
|
||||||
|
deprecated_server_resource_name: 'NovaCompute'
|
||||||
disable_upgrade_deployment: True
|
disable_upgrade_deployment: True
|
||||||
ServicesDefault:
|
ServicesDefault:
|
||||||
- OS::TripleO::Services::AuditD
|
- OS::TripleO::Services::AuditD
|
||||||
|
|
|
@ -151,6 +151,15 @@
|
||||||
- Tenant
|
- Tenant
|
||||||
- Storage
|
- Storage
|
||||||
HostnameFormatDefault: '%stackname%-novacompute-%index%'
|
HostnameFormatDefault: '%stackname%-novacompute-%index%'
|
||||||
|
# Deprecated & backward-compatible values (FIXME: Make parameters consistent)
|
||||||
|
# Set uses_deprecated_params to True if any deprecated params are used.
|
||||||
|
uses_deprecated_params: True
|
||||||
|
deprecated_param_image: 'NovaImage'
|
||||||
|
deprecated_param_extraconfig: 'NovaComputeExtraConfig'
|
||||||
|
deprecated_param_metadata: 'NovaComputeServerMetadata'
|
||||||
|
deprecated_param_scheduler_hints: 'NovaComputeSchedulerHints'
|
||||||
|
deprecated_param_ips: 'NovaComputeIPs'
|
||||||
|
deprecated_server_resource_name: 'NovaCompute'
|
||||||
disable_upgrade_deployment: True
|
disable_upgrade_deployment: True
|
||||||
ServicesDefault:
|
ServicesDefault:
|
||||||
- OS::TripleO::Services::AuditD
|
- OS::TripleO::Services::AuditD
|
||||||
|
|
Loading…
Reference in New Issue