Fix standalone ControllerOpenstack vars
As we've moved to more dynamic generation of variables, the correct variable names are *ControllerOpenstack* not *Controller* for the example standalone environment. Change-Id: Iaa39de9d8794a856e76cc9995d046484632cf604 Closes-Bug: #1721877
This commit is contained in:
parent
7f82dbe588
commit
536d1c4af5
|
@ -30,13 +30,13 @@ parameter_defaults:
|
||||||
# Type: string
|
# Type: string
|
||||||
ComputeHostnameFormat: '%stackname%-novacompute-%index%'
|
ComputeHostnameFormat: '%stackname%-novacompute-%index%'
|
||||||
|
|
||||||
# Number of Controller nodes to deploy
|
# Number of ControllerOpenstack nodes
|
||||||
# Type: number
|
# Type: number
|
||||||
ControllerCount: 3
|
ControllerOpenstackCount: 3
|
||||||
|
|
||||||
# Format for Controller node hostnames Note %index% is translated into the index of the node, e.g 0/1/2 etc and %stackname% is replaced with the stack name e.g overcloud
|
# Format for ControllerOpenstack node hostnames Note %index% is translated into the index of the node, e.g 0/1/2 etc and %stackname% is replaced with the stack name e.g overcloud
|
||||||
# Type: string
|
# Type: string
|
||||||
ControllerHostnameFormat: '%stackname%-controller-%index%'
|
ControllerOpenstackHostnameFormat: '%stackname%-controller-%index%'
|
||||||
|
|
||||||
# Number of Database nodes
|
# Number of Database nodes
|
||||||
# Type: number
|
# Type: number
|
||||||
|
@ -66,9 +66,9 @@ parameter_defaults:
|
||||||
# Type: string
|
# Type: string
|
||||||
OvercloudComputeFlavor: compute
|
OvercloudComputeFlavor: compute
|
||||||
|
|
||||||
# Name of the flavor for Controller nodes
|
# Name of the flavor for ControllerOpenstack nodes
|
||||||
# Type: string
|
# Type: string
|
||||||
OvercloudControllerFlavor: control
|
OvercloudControllerOpenstackFlavor: control
|
||||||
|
|
||||||
# Name of the flavor for Database nodes
|
# Name of the flavor for Database nodes
|
||||||
# Type: string
|
# Type: string
|
||||||
|
|
|
@ -89,10 +89,8 @@ environments:
|
||||||
files:
|
files:
|
||||||
overcloud.yaml:
|
overcloud.yaml:
|
||||||
parameters:
|
parameters:
|
||||||
- ControllerHostnameFormat
|
|
||||||
- ComputeHostnameFormat
|
- ComputeHostnameFormat
|
||||||
- CephStorageHostnameFormat
|
- CephStorageHostnameFormat
|
||||||
- ControllerCount
|
|
||||||
- ComputeCount
|
- ComputeCount
|
||||||
- CephStorageCount
|
- CephStorageCount
|
||||||
puppet/services/time/ntp.yaml:
|
puppet/services/time/ntp.yaml:
|
||||||
|
@ -100,19 +98,21 @@ environments:
|
||||||
- NtpServer
|
- NtpServer
|
||||||
sample-env-generator/composable-roles.yaml:
|
sample-env-generator/composable-roles.yaml:
|
||||||
parameters:
|
parameters:
|
||||||
|
- ControllerOpenstackHostnameFormat
|
||||||
- DnsServers
|
- DnsServers
|
||||||
|
- ControllerOpenstackCount
|
||||||
- DatabaseCount
|
- DatabaseCount
|
||||||
- MessagingCount
|
- MessagingCount
|
||||||
- NetworkerCount
|
- NetworkerCount
|
||||||
- OvercloudControllerFlavor
|
- OvercloudControllerOpenstackFlavor
|
||||||
- OvercloudComputeFlavor
|
- OvercloudComputeFlavor
|
||||||
- OvercloudCephStorageFlavor
|
- OvercloudCephStorageFlavor
|
||||||
- OvercloudDatabaseFlavor
|
- OvercloudDatabaseFlavor
|
||||||
- OvercloudMessagingFlavor
|
- OvercloudMessagingFlavor
|
||||||
- OvercloudNetworkerFlavor
|
- OvercloudNetworkerFlavor
|
||||||
sample_values:
|
sample_values:
|
||||||
ControllerCount: 3
|
ControllerOpenstackCount: 3
|
||||||
OvercloudControllerFlavor: control
|
OvercloudControllerOpenstackFlavor: control
|
||||||
ComputeCount: 1
|
ComputeCount: 1
|
||||||
OvercloudComputeFlavor: compute
|
OvercloudComputeFlavor: compute
|
||||||
CephStorageCount: 1
|
CephStorageCount: 1
|
||||||
|
@ -135,6 +135,10 @@ parameters:
|
||||||
description: DNS servers to use for the Overcloud
|
description: DNS servers to use for the Overcloud
|
||||||
type: comma_delimited_list
|
type: comma_delimited_list
|
||||||
# Dynamic vars based on roles
|
# Dynamic vars based on roles
|
||||||
|
ControllerOpenstackCount:
|
||||||
|
default: 0
|
||||||
|
description: Number of ControllerOpenstack nodes
|
||||||
|
type: number
|
||||||
DatabaseCount:
|
DatabaseCount:
|
||||||
default: 0
|
default: 0
|
||||||
description: Number of Database nodes
|
description: Number of Database nodes
|
||||||
|
@ -147,10 +151,21 @@ parameters:
|
||||||
default: 0
|
default: 0
|
||||||
description: Number of Networker nodes
|
description: Number of Networker nodes
|
||||||
type: number
|
type: number
|
||||||
|
ControllerOpenstackHostnameFormat:
|
||||||
|
type: string
|
||||||
|
description: >
|
||||||
|
Format for ControllerOpenstack node hostnames
|
||||||
|
Note %index% is translated into the index of the node, e.g 0/1/2 etc
|
||||||
|
and %stackname% is replaced with the stack name e.g overcloud
|
||||||
|
default: "%stackname%-controller-%index%"
|
||||||
OvercloudControllerFlavor:
|
OvercloudControllerFlavor:
|
||||||
default: control
|
default: control
|
||||||
description: Name of the flavor for Controller nodes
|
description: Name of the flavor for Controller nodes
|
||||||
type: string
|
type: string
|
||||||
|
OvercloudControllerOpenstackFlavor:
|
||||||
|
default: control
|
||||||
|
description: Name of the flavor for ControllerOpenstack nodes
|
||||||
|
type: string
|
||||||
OvercloudComputeFlavor:
|
OvercloudComputeFlavor:
|
||||||
default: compute
|
default: compute
|
||||||
description: Name of the flavor for Compute nodes
|
description: Name of the flavor for Compute nodes
|
||||||
|
|
Loading…
Reference in New Issue