Add baremetal_config_drive parameter for baremetal instances
This also sets OS::OVB::BMC to OS::Heat::None for the extra nodes roles. Change-Id: Ib7ac727d29012427a11ddb4dd6e51a3534d8aece
This commit is contained in:
parent
cfaf78da7f
commit
d6452234c0
|
@ -11,6 +11,10 @@
|
|||
# should be used like a role file, but will deploy an undercloud-like
|
||||
# node instead of more baremetal nodes.
|
||||
parameter_defaults:
|
||||
# If True, enable config drive on baremetal instances.
|
||||
# Type: boolean
|
||||
baremetal_config_drive: False
|
||||
|
||||
# Recommended to be at least 1 vcpu, 4 GB RAM, 50 GB disk
|
||||
# Type: string
|
||||
baremetal_flavor: baremetal
|
||||
|
@ -37,4 +41,5 @@ parameter_defaults:
|
|||
role: extra
|
||||
|
||||
resource_registry:
|
||||
OS::OVB::BMC: OS::Heat::None
|
||||
OS::OVB::BaremetalPorts: ../templates/baremetal-ports-extra-node-all.yaml
|
||||
|
|
|
@ -11,6 +11,10 @@
|
|||
# should be used like a role file, but will deploy an undercloud-like
|
||||
# node instead of more baremetal nodes.
|
||||
parameter_defaults:
|
||||
# If True, enable config drive on baremetal instances.
|
||||
# Type: boolean
|
||||
baremetal_config_drive: False
|
||||
|
||||
# Recommended to be at least 1 vcpu, 4 GB RAM, 50 GB disk
|
||||
# Type: string
|
||||
baremetal_flavor: baremetal
|
||||
|
@ -37,4 +41,5 @@ parameter_defaults:
|
|||
role: extra
|
||||
|
||||
resource_registry:
|
||||
OS::OVB::BMC: OS::Heat::None
|
||||
OS::OVB::BaremetalPorts: ../templates/baremetal-ports-extra-node.yaml
|
||||
|
|
|
@ -60,6 +60,9 @@ environments:
|
|||
templates/bmc.yaml:
|
||||
parameters:
|
||||
- config_drive
|
||||
templates/virtual-baremetal-servers.yaml:
|
||||
parameters:
|
||||
- baremetal_config_drive
|
||||
templates/quintupleo.yaml:
|
||||
parameters:
|
||||
- baremetal_flavor
|
||||
|
@ -73,12 +76,14 @@ environments:
|
|||
node_count: 1
|
||||
resource_registry:
|
||||
OS::OVB::BaremetalPorts: ../templates/baremetal-ports-extra-node.yaml
|
||||
OS::OVB::BMC: OS::Heat::None
|
||||
children:
|
||||
-
|
||||
name: base-extra-node-all
|
||||
title: Base Configuration Options for Extra Nodes with All Ports Open
|
||||
resource_registry:
|
||||
OS::OVB::BaremetalPorts: ../templates/baremetal-ports-extra-node-all.yaml
|
||||
OS::OVB::BMC: OS::Heat::None
|
||||
-
|
||||
name: all-networks
|
||||
title: Deploy with All Networks Enabled
|
||||
|
|
|
@ -31,6 +31,11 @@ parameters:
|
|||
suffix:
|
||||
type: string
|
||||
|
||||
baremetal_config_drive:
|
||||
type: boolean
|
||||
default: false
|
||||
description: If True, enable config drive on baremetal instances.
|
||||
|
||||
resources:
|
||||
|
||||
baremetal_ports:
|
||||
|
@ -56,7 +61,7 @@ resources:
|
|||
type: OS::Nova::Server
|
||||
properties:
|
||||
flavor: {get_param: baremetal_flavor}
|
||||
config_drive: false
|
||||
config_drive: {get_param: baremetal_config_drive}
|
||||
key_name: {get_param: key_name}
|
||||
networks: {get_attr: [baremetal_ports, ports]}
|
||||
block_device_mapping:
|
||||
|
|
|
@ -23,6 +23,11 @@ parameters:
|
|||
suffix:
|
||||
type: string
|
||||
|
||||
baremetal_config_drive:
|
||||
type: boolean
|
||||
default: false
|
||||
description: If True, enable config drive on baremetal instances.
|
||||
|
||||
resources:
|
||||
|
||||
baremetal_ports:
|
||||
|
@ -37,7 +42,7 @@ resources:
|
|||
properties:
|
||||
flavor: {get_param: baremetal_flavor}
|
||||
image: {get_param: baremetal_image}
|
||||
config_drive: false
|
||||
config_drive: {get_param: config_drive}
|
||||
key_name: {get_param: key_name}
|
||||
networks: {get_attr: [baremetal_ports, ports]}
|
||||
name: {get_param: baremetal_name}
|
||||
|
|
Loading…
Reference in New Issue