Skip to content

Commit cfc7a38

Browse files
authored
Stop recommended disk sizes that are too low (#1790)
Still a lot of references to 30 GiB, even though the default value is 60 (and in some cases it's still not enough). Signed-off-by: Dmitry Tantsur <[email protected]>
1 parent 5c33bf9 commit cfc7a38

File tree

3 files changed

+16
-12
lines changed

3 files changed

+16
-12
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -438,17 +438,17 @@ by the [vm_setup_vars.yml](vm_setup_vars.yml) file, which sets some dev-scripts
438438
variables that override the defaults in metal3-dev-env.
439439
440440
The VM resources can be overridden by setting the following environment variables
441-
in `config_$USER.sh`:
441+
in `config_$USER.sh` (check `config_example.sh` for recommended defaults):
442442
443443
```
444444
# Change VM resources for masters
445445
#export MASTER_MEMORY=16384
446-
#export MASTER_DISK=20
446+
#export MASTER_DISK=60
447447
#export MASTER_VCPU=8
448448

449449
# Change VM resources for workers
450450
#export WORKER_MEMORY=8192
451-
#export WORKER_DISK=20
451+
#export WORKER_DISK=60
452452
#export WORKER_VCPU=4
453453
```
454454

agent/docs/config-presets-and-options.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ values to to achieve the above cluster topologies.
4040
| NUM_WORKERS | 2 | 2+ | 0 | 0 |
4141
| NUM_EXTRA_WORKERS | 0 | 0 | 0 | 0 |
4242
| MASTER_MEMORY | 16384 | 16384 | 16384 | 32768 |
43-
| MASTER_DISK | 30 | 120 | 120 | 120 |
43+
| MASTER_DISK | 60 | 120 | 120 | 120 |
4444
| MASTER_VCPU | 8 | 8 | 8 | 8 |
4545
| WORKER_MEMORY | 8192 | 16384 | | |
46-
| WORKER_DISK | 30 | 120 | | |
46+
| WORKER_DISK | 60 | 120 | | |
4747
| WORKER_VCPU | 4 | 4 | | |
4848
| EXTRA_WORKER_MEMORY | 8192 | 16384 | | |
49-
| EXTRA_WORKER_DISK | 30 | 120 | | |
49+
| EXTRA_WORKER_DISK | 60 | 120 | | |
5050
| EXTRA_WORKER_VCPU | 4 | 4 | | |
5151

5252
## Defining the Network Topology

config_example.sh

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -512,13 +512,15 @@ set -x
512512

513513
# MASTER_MEMORY, MASTER_DISK, MASTER_VCPU -
514514
# Change VM resources for masters
515+
# The provided defaults are really bare minimum: if possible, you should
516+
# always increase them.
515517
## Defaults:
516-
## MASTER_DISK=30
518+
## MASTER_DISK=60
517519
## MASTER_MEMORY=16384
518520
## MASTER_VCPU=8
519521
#
520522
#export MASTER_MEMORY=16384
521-
#export MASTER_DISK=40
523+
#export MASTER_DISK=60
522524
#export MASTER_VCPU=8
523525

524526
# ARBITER_HOSTNAME_FORMAT -
@@ -567,13 +569,15 @@ set -x
567569

568570
# WORKER_MEMORY, WORKER_DISK, WORKER_VCPU -
569571
# Change VM resources for workers.
572+
# The provided defaults are really bare minimum: if possible, you should
573+
# always increase them.
570574
## Defaults:
571-
## WORKER_DISK=30
575+
## WORKER_DISK=60
572576
## WORKER_MEMORY=8192
573577
## WORKER_VCPU=4
574578
#
575579
#export WORKER_MEMORY=8192
576-
#export WORKER_DISK=30
580+
#export WORKER_DISK=60
577581
#export WORKER_VCPU=4
578582

579583
# NUM_EXTRA_WORKERS - Indicate number of extra VMs to create but not deploy.
@@ -585,12 +589,12 @@ set -x
585589
# Change VM resources for extra workers. If not supplied defaults to the
586590
# regular workers specs.
587591
## Defaults:
588-
## EXTRA_WORKER_DISK=30
592+
## EXTRA_WORKER_DISK=60
589593
## EXTRA_WORKER_MEMORY=8192
590594
## EXTRA_WORKER_VCPU=4
591595
#
592596
#export EXTRA_WORKER_MEMORY=8192
593-
#export EXTRA_WORKER_DISK=30
597+
#export EXTRA_WORKER_DISK=60
594598
#export EXTRA_WORKER_VCPU=4
595599

596600
# EXTRA_WORKERS_ONLINE_STATUS -

0 commit comments

Comments
 (0)