Fix missing keys;Add core deployment option
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Danny Bessems 2023-03-18 20:08:34 +01:00
parent 68f0524bda
commit df91de5516
3 changed files with 37 additions and 11 deletions

View File

@ -1,5 +1,11 @@
- import_tasks: hypervisor.yml - import_tasks: hypervisor.yml
- import_tasks: registry.yml - import_tasks: registry.yml
- import_tasks: nodetemplates.yml - import_tasks: nodetemplates.yml
- import_tasks: clusterapi.yml
- import_tasks: gitops.yml - block:
- import_tasks: clusterapi.yml
- import_tasks: gitops.yml
when:
- vapp['deployment.type'] != 'core'

View File

@ -42,6 +42,11 @@
disk: disk:
- size: 1Gb - size: 1Gb
unit_number: 1 unit_number: 1
when: ova_deploy.results[index] is not skipped
loop: "{{ ova_deploy.results }}"
loop_control:
index_var: index
label: "{{ item.item }}"
# Disabled to allow disks to be resized; at the cost of cloning speed # Disabled to allow disks to be resized; at the cost of cloning speed
# - name: Create snapshot on deployed VM's # - name: Create snapshot on deployed VM's

View File

@ -6,9 +6,11 @@ DeploymentConfigurations:
- Id: cp1w2 - Id: cp1w2
Label: 'Workload-cluster: 1 control-plane node/2 worker nodes' Label: 'Workload-cluster: 1 control-plane node/2 worker nodes'
Description: | Description: 1 control-plane node/2 worker nodes
1 control-plane node
2 worker nodes - Id: core
Label: No workload-cluster
Description: Only the metacluster is deployed (useful for recovery scenario's)
DynamicDisks: DynamicDisks:
@ -28,6 +30,7 @@ PropertyCategories:
Value: Value:
- cp1w1 - cp1w1
- cp1w2 - cp1w2
- core
UserConfigurable: false UserConfigurable: false
- Name: 1) Meta-cluster - Name: 1) Meta-cluster
@ -124,7 +127,9 @@ PropertyCategories:
Label: Workload-cluster name* Label: Workload-cluster name*
Description: '' Description: ''
DefaultValue: 'workload-{{ hostname.suffix }}' DefaultValue: 'workload-{{ hostname.suffix }}'
Configurations: '*' Configurations:
- cp1w1
- cp1w2
UserConfigurable: true UserConfigurable: true
- Key: workloadcluster.vip - Key: workloadcluster.vip
@ -132,7 +137,9 @@ PropertyCategories:
Label: Workload-cluster virtual IP address* Label: Workload-cluster virtual IP address*
Description: Workload-cluster control plane endpoint virtual IP address Description: Workload-cluster control plane endpoint virtual IP address
DefaultValue: '' DefaultValue: ''
Configurations: '*' Configurations:
- cp1w1
- cp1w2
UserConfigurable: true UserConfigurable: true
- Key: ippool.startip - Key: ippool.startip
@ -140,7 +147,9 @@ PropertyCategories:
Label: Workload-cluster IP-pool start IP address* Label: Workload-cluster IP-pool start IP address*
Description: All nodes for the workload-cluster will be provisioned within this IP pool Description: All nodes for the workload-cluster will be provisioned within this IP pool
DefaultValue: '' DefaultValue: ''
Configurations: '*' Configurations:
- cp1w1
- cp1w2
UserConfigurable: true UserConfigurable: true
- Key: ippool.endip - Key: ippool.endip
@ -148,7 +157,9 @@ PropertyCategories:
Label: Workload-cluster IP-pool end IP address* Label: Workload-cluster IP-pool end IP address*
Description: All nodes for the workload-cluster will be provisioned within this IP pool Description: All nodes for the workload-cluster will be provisioned within this IP pool
DefaultValue: '' DefaultValue: ''
Configurations: '*' Configurations:
- cp1w1
- cp1w2
UserConfigurable: true UserConfigurable: true
- Key: workloadcluster.nodesize - Key: workloadcluster.nodesize
@ -159,7 +170,9 @@ PropertyCategories:
- SMALL: 2 vCPU/6GB RAM - SMALL: 2 vCPU/6GB RAM
- MEDIUM: 4 vCPU/8GB RAM - MEDIUM: 4 vCPU/8GB RAM
DefaultValue: 'small' DefaultValue: 'small'
Configurations: '*' Configurations:
- cp1w1
- cp1w2
UserConfigurable: true UserConfigurable: true
- Key: workloadcluster.additionaldisk - Key: workloadcluster.additionaldisk
@ -167,7 +180,9 @@ PropertyCategories:
Label: Workload-cluster block storage disk size* Label: Workload-cluster block storage disk size*
Description: 'All worker-nodes for the workload-cluster will be provisioned with an additional disk of the specified size' Description: 'All worker-nodes for the workload-cluster will be provisioned with an additional disk of the specified size'
DefaultValue: '20' DefaultValue: '20'
Configurations: '*' Configurations:
- cp1w1
- cp1w2
UserConfigurable: true UserConfigurable: true
- Name: 4) Common - Name: 4) Common