diff options
| author |   Zuul <zuul@review.openstack.org> | 2017-11-02 11:00:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-11-02 11:00:14 +0000 |
| commit | 34566ec6a091387b85f4a4636f64fa68f903b29d (patch) | |
| tree | bcfc2bfe400ca6ce690022ecfe985468d2c3acb9 /sample-env-generator/composable-roles.yaml | |
| parent | 6f3409cab47aed9e5e1c4c77ee02edf2d260ec95 (diff) | |
| parent | 0ec618ec8875ecc523c21842ef56a71d9f5e9347 (diff) | |
Merge "Fix standalone ControllerOpenstack vars" into stable/pike
Diffstat (limited to 'sample-env-generator/composable-roles.yaml')
| -rw-r--r-- | sample-env-generator/composable-roles.yaml | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/sample-env-generator/composable-roles.yaml b/sample-env-generator/composable-roles.yaml index 91d6060f..2c929a4b 100644 --- a/sample-env-generator/composable-roles.yaml +++ b/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 |