Merge "Align template defaults with the client"
This commit is contained in:
commit
6746cb80f3
|
@ -78,7 +78,7 @@ parameters:
|
||||||
via parameter_defaults in the resource registry.
|
via parameter_defaults in the resource registry.
|
||||||
CloudName:
|
CloudName:
|
||||||
type: string
|
type: string
|
||||||
default: ''
|
default: overcloud
|
||||||
description: The DNS name of this cloud. E.g. ci-overcloud.tripleo.org
|
description: The DNS name of this cloud. E.g. ci-overcloud.tripleo.org
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
|
|
|
@ -65,7 +65,7 @@ parameters:
|
||||||
description: Whether to enable or not the Rbd backend for Cinder
|
description: Whether to enable or not the Rbd backend for Cinder
|
||||||
type: boolean
|
type: boolean
|
||||||
CloudName:
|
CloudName:
|
||||||
default: ''
|
default: overcloud
|
||||||
description: The DNS name of this cloud. E.g. ci-overcloud.tripleo.org
|
description: The DNS name of this cloud. E.g. ci-overcloud.tripleo.org
|
||||||
type: string
|
type: string
|
||||||
ControlFixedIPs:
|
ControlFixedIPs:
|
||||||
|
@ -329,11 +329,12 @@ parameters:
|
||||||
type: json
|
type: json
|
||||||
controllerImage:
|
controllerImage:
|
||||||
type: string
|
type: string
|
||||||
default: overcloud-control
|
default: overcloud-full
|
||||||
constraints:
|
constraints:
|
||||||
- custom_constraint: glance.image
|
- custom_constraint: glance.image
|
||||||
OvercloudControlFlavor:
|
OvercloudControlFlavor:
|
||||||
description: Flavor for control nodes to request when deploying.
|
description: Flavor for control nodes to request when deploying.
|
||||||
|
default: baremetal
|
||||||
type: string
|
type: string
|
||||||
constraints:
|
constraints:
|
||||||
- custom_constraint: nova.flavor
|
- custom_constraint: nova.flavor
|
||||||
|
@ -551,7 +552,7 @@ parameters:
|
||||||
description: What interface to add to the HypervisorNeutronPhysicalBridge.
|
description: What interface to add to the HypervisorNeutronPhysicalBridge.
|
||||||
type: string
|
type: string
|
||||||
NeutronNetworkVLANRanges:
|
NeutronNetworkVLANRanges:
|
||||||
default: 'datacentre'
|
default: 'datacentre:1:1000'
|
||||||
description: >
|
description: >
|
||||||
The Neutron ML2 and OpenVSwitch vlan mapping range to support. See the
|
The Neutron ML2 and OpenVSwitch vlan mapping range to support. See the
|
||||||
Neutron documentation for permitted values. Defaults to permitting any
|
Neutron documentation for permitted values. Defaults to permitting any
|
||||||
|
@ -567,7 +568,7 @@ parameters:
|
||||||
structure as ExtraConfig.
|
structure as ExtraConfig.
|
||||||
type: json
|
type: json
|
||||||
NovaComputeLibvirtType:
|
NovaComputeLibvirtType:
|
||||||
default: ''
|
default: kvm
|
||||||
type: string
|
type: string
|
||||||
NovaComputeLibvirtVifDriver:
|
NovaComputeLibvirtVifDriver:
|
||||||
default: ''
|
default: ''
|
||||||
|
@ -583,7 +584,7 @@ parameters:
|
||||||
type: boolean
|
type: boolean
|
||||||
NovaImage:
|
NovaImage:
|
||||||
type: string
|
type: string
|
||||||
default: overcloud-compute
|
default: overcloud-full
|
||||||
constraints:
|
constraints:
|
||||||
- custom_constraint: glance.image
|
- custom_constraint: glance.image
|
||||||
NovaOVSBridge:
|
NovaOVSBridge:
|
||||||
|
@ -596,6 +597,7 @@ parameters:
|
||||||
type: string
|
type: string
|
||||||
OvercloudComputeFlavor:
|
OvercloudComputeFlavor:
|
||||||
description: Use this flavor
|
description: Use this flavor
|
||||||
|
default: baremetal
|
||||||
type: string
|
type: string
|
||||||
constraints:
|
constraints:
|
||||||
- custom_constraint: nova.flavor
|
- custom_constraint: nova.flavor
|
||||||
|
@ -638,10 +640,11 @@ parameters:
|
||||||
type: number
|
type: number
|
||||||
default: 0
|
default: 0
|
||||||
BlockStorageImage:
|
BlockStorageImage:
|
||||||
default: overcloud-cinder-volume
|
default: overcloud-full
|
||||||
type: string
|
type: string
|
||||||
OvercloudBlockStorageFlavor:
|
OvercloudBlockStorageFlavor:
|
||||||
description: Flavor for block storage nodes to request when deploying.
|
description: Flavor for block storage nodes to request when deploying.
|
||||||
|
default: baremetal
|
||||||
type: string
|
type: string
|
||||||
constraints:
|
constraints:
|
||||||
- custom_constraint: nova.flavor
|
- custom_constraint: nova.flavor
|
||||||
|
@ -663,11 +666,12 @@ parameters:
|
||||||
default: 0
|
default: 0
|
||||||
OvercloudSwiftStorageFlavor:
|
OvercloudSwiftStorageFlavor:
|
||||||
description: Flavor for Swift storage nodes to request when deploying.
|
description: Flavor for Swift storage nodes to request when deploying.
|
||||||
|
default: baremetal
|
||||||
type: string
|
type: string
|
||||||
constraints:
|
constraints:
|
||||||
- custom_constraint: nova.flavor
|
- custom_constraint: nova.flavor
|
||||||
SwiftStorageImage:
|
SwiftStorageImage:
|
||||||
default: overcloud-swift-storage
|
default: overcloud-full
|
||||||
type: string
|
type: string
|
||||||
ObjectStorageExtraConfig:
|
ObjectStorageExtraConfig:
|
||||||
default: {}
|
default: {}
|
||||||
|
@ -685,7 +689,7 @@ parameters:
|
||||||
type: number
|
type: number
|
||||||
default: 0
|
default: 0
|
||||||
CephStorageImage:
|
CephStorageImage:
|
||||||
default: overcloud-ceph-storage
|
default: overcloud-full
|
||||||
type: string
|
type: string
|
||||||
OvercloudCephStorageFlavor:
|
OvercloudCephStorageFlavor:
|
||||||
default: baremetal
|
default: baremetal
|
||||||
|
|
|
@ -100,7 +100,7 @@ parameters:
|
||||||
description: The tenant network type for Neutron.
|
description: The tenant network type for Neutron.
|
||||||
default: 'vxlan'
|
default: 'vxlan'
|
||||||
NeutronNetworkVLANRanges:
|
NeutronNetworkVLANRanges:
|
||||||
default: 'datacentre'
|
default: 'datacentre:1:1000'
|
||||||
description: >
|
description: >
|
||||||
The Neutron ML2 and OpenVSwitch vlan mapping range to support. See the
|
The Neutron ML2 and OpenVSwitch vlan mapping range to support. See the
|
||||||
Neutron documentation for permitted values. Defaults to permitting any
|
Neutron documentation for permitted values. Defaults to permitting any
|
||||||
|
@ -195,7 +195,7 @@ parameters:
|
||||||
type: json
|
type: json
|
||||||
NovaComputeLibvirtType:
|
NovaComputeLibvirtType:
|
||||||
type: string
|
type: string
|
||||||
default: ''
|
default: kvm
|
||||||
NovaComputeLibvirtVifDriver:
|
NovaComputeLibvirtVifDriver:
|
||||||
default: ''
|
default: ''
|
||||||
description: Libvirt VIF driver configuration for the network
|
description: Libvirt VIF driver configuration for the network
|
||||||
|
|
|
@ -85,7 +85,7 @@ parameters:
|
||||||
description: Number of workers for Cinder service.
|
description: Number of workers for Cinder service.
|
||||||
type: number
|
type: number
|
||||||
CloudName:
|
CloudName:
|
||||||
default: ''
|
default: overcloud
|
||||||
description: The DNS name of this cloud. E.g. ci-overcloud.tripleo.org
|
description: The DNS name of this cloud. E.g. ci-overcloud.tripleo.org
|
||||||
type: string
|
type: string
|
||||||
ControllerExtraConfig:
|
ControllerExtraConfig:
|
||||||
|
@ -442,7 +442,7 @@ parameters:
|
||||||
description: The tenant network type for Neutron.
|
description: The tenant network type for Neutron.
|
||||||
type: comma_delimited_list
|
type: comma_delimited_list
|
||||||
NeutronNetworkVLANRanges:
|
NeutronNetworkVLANRanges:
|
||||||
default: 'datacentre'
|
default: 'datacentre:1:1000'
|
||||||
description: >
|
description: >
|
||||||
The Neutron ML2 and OpenVSwitch vlan mapping range to support. See the
|
The Neutron ML2 and OpenVSwitch vlan mapping range to support. See the
|
||||||
Neutron documentation for permitted values. Defaults to permitting any
|
Neutron documentation for permitted values. Defaults to permitting any
|
||||||
|
|
Loading…
Reference in New Issue