Skip to content

Commit

Permalink
Fix VM_EXTRADISKS_LIST default
Browse files Browse the repository at this point in the history
Currently this is wrong, since the primary disk shows up as sda
due to using virtio-scsi, but then the single additional disk
uses virtio and shows up as vda, not vdb.
  • Loading branch information
Steven Hardy committed Feb 17, 2022
1 parent 3a31067 commit 93b33cd
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ export NUM_WORKERS=${NUM_WORKERS:-"2"}
export NUM_EXTRA_WORKERS=${NUM_EXTRA_WORKERS:-"0"}
export EXTRA_WORKERS_ONLINE_STATUS=${EXTRA_WORKERS_ONLINE_STATUS:-"true"}
export VM_EXTRADISKS=${VM_EXTRADISKS:-"false"}
export VM_EXTRADISKS_LIST=${VM_EXTRADISKS_LIST:-"vdb"}
export VM_EXTRADISKS_LIST=${VM_EXTRADISKS_LIST:-"vda"}
export VM_EXTRADISKS_SIZE=${VM_EXTRADISKS_SIZE:-"8G"}
export MASTER_HOSTNAME_FORMAT=${MASTER_HOSTNAME_FORMAT:-"master-%d"}
export WORKER_HOSTNAME_FORMAT=${WORKER_HOSTNAME_FORMAT:-"worker-%d"}
Expand Down
2 changes: 1 addition & 1 deletion vm_setup_vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ironic_prefix: "{{ ironic_prefix }}"
num_masters: 3
num_workers: 1
num_extraworkers: 0
extradisks_list: "{{ lookup('env', 'VM_EXTRADISKS_LIST').split(' ') | default(['vdb']) }}"
extradisks_list: "{{ lookup('env', 'VM_EXTRADISKS_LIST').split(' ') | default(['vda']) }}"
extradisks_size: "{{ lookup('env', 'VM_EXTRADISKS_SIZE') | default(['8G']) }}"
flavors:
master:
Expand Down

0 comments on commit 93b33cd

Please sign in to comment.