Browse Source

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
changes/33/510233/1
Alex Schultz 4 years ago
parent
commit
536d1c4af5
  1. 12
      environments/composable-roles/standalone.yaml
  2. 25
      sample-env-generator/composable-roles.yaml

12
environments/composable-roles/standalone.yaml

@ -30,13 +30,13 @@ parameter_defaults:
# Type: string
ComputeHostnameFormat: '%stackname%-novacompute-%index%'
# Number of Controller nodes to deploy
# Number of ControllerOpenstack nodes
# 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
ControllerHostnameFormat: '%stackname%-controller-%index%'
ControllerOpenstackHostnameFormat: '%stackname%-controller-%index%'
# Number of Database nodes
# Type: number
@ -66,9 +66,9 @@ parameter_defaults:
# Type: string
OvercloudComputeFlavor: compute
# Name of the flavor for Controller nodes
# Name of the flavor for ControllerOpenstack nodes
# Type: string
OvercloudControllerFlavor: control
OvercloudControllerOpenstackFlavor: control
# Name of the flavor for Database nodes
# Type: string

25
sample-env-generator/composable-roles.yaml

@ -89,10 +89,8 @@ environments:
files:
overcloud.yaml:
parameters:
- ControllerHostnameFormat
- ComputeHostnameFormat
- CephStorageHostnameFormat
- ControllerCount
- ComputeCount
- CephStorageCount
puppet/services/time/ntp.yaml:
@ -100,19 +98,21 @@ environments:
- NtpServer
sample-env-generator/composable-roles.yaml:
parameters:
- ControllerOpenstackHostnameFormat
- DnsServers
- ControllerOpenstackCount
- DatabaseCount
- MessagingCount
- NetworkerCount
- OvercloudControllerFlavor
- OvercloudControllerOpenstackFlavor
- OvercloudComputeFlavor
- OvercloudCephStorageFlavor
- OvercloudDatabaseFlavor
- OvercloudMessagingFlavor
- OvercloudNetworkerFlavor
sample_values:
ControllerCount: 3
OvercloudControllerFlavor: control
ControllerOpenstackCount: 3
OvercloudControllerOpenstackFlavor: control
ComputeCount: 1
OvercloudComputeFlavor: compute
CephStorageCount: 1
@ -135,6 +135,10 @@ parameters:
description: DNS servers to use for the Overcloud
type: comma_delimited_list
# Dynamic vars based on roles
ControllerOpenstackCount:
default: 0
description: Number of ControllerOpenstack nodes
type: number
DatabaseCount:
default: 0
description: Number of Database nodes
@ -147,10 +151,21 @@ parameters:
default: 0
description: Number of Networker nodes
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:
default: control
description: Name of the flavor for Controller nodes
type: string
OvercloudControllerOpenstackFlavor:
default: control
description: Name of the flavor for ControllerOpenstack nodes
type: string
OvercloudComputeFlavor:
default: compute
description: Name of the flavor for Compute nodes

Loading…
Cancel
Save