diff options
| author | Zuul <zuul@review.opendev.org> | 2019-04-26 11:34:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-04-26 11:34:45 +0000 |
| commit | ce7be6477df6c119e8844e5d86f23c0ca1b87f54 (patch) | |
| tree | c0913cf3439777e243b41be3132fecbbedc08932 | |
| parent | 055ef0a1727fb04b9e985b46a51dee56847d40ea (diff) | |
| parent | 01a7956c527b90c685a813d7060605990f55658a (diff) | |
| download | ironic-ce7be6477df6c119e8844e5d86f23c0ca1b87f54.tar.gz | |
Merge "Ansible module: fix partition_configdrive.sh file" into stable/queens
| -rwxr-xr-x | ironic/drivers/modules/ansible/playbooks/roles/deploy/files/partition_configdrive.sh | 5 | ||||
| -rw-r--r-- | releasenotes/notes/bug-30317-a972c8d879c98941.yaml | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/ironic/drivers/modules/ansible/playbooks/roles/deploy/files/partition_configdrive.sh b/ironic/drivers/modules/ansible/playbooks/roles/deploy/files/partition_configdrive.sh index 056a8152c..a33ff22ee 100755 --- a/ironic/drivers/modules/ansible/playbooks/roles/deploy/files/partition_configdrive.sh +++ b/ironic/drivers/modules/ansible/playbooks/roles/deploy/files/partition_configdrive.sh @@ -54,8 +54,9 @@ partprobe $DEVICE || true # Check for preexisting partition for configdrive EXISTING_PARTITION=`/sbin/blkid -l -o device $DEVICE -t LABEL=config-2` if [ -z $EXISTING_PARTITION ]; then - # Check if it is GPT partition and needs to be re-sized - if [ `partprobe $DEVICE print 2>&1 | grep "fix the GPT to use all of the space"` ]; then + # Check if it is GPT partition. Relocate the end table header to the end of + # disk (does not hurt if not needed anyway). Create the configdrive part + if parted -s $DEVICE print 2>&1 | grep -iq 'gpt'; then log "Fixing GPT to use all of the space on device $DEVICE" sgdisk -e $DEVICE || fail "move backup GPT data structures to the end of ${DEVICE}" diff --git a/releasenotes/notes/bug-30317-a972c8d879c98941.yaml b/releasenotes/notes/bug-30317-a972c8d879c98941.yaml new file mode 100644 index 000000000..793a5dc44 --- /dev/null +++ b/releasenotes/notes/bug-30317-a972c8d879c98941.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Fixes deployment with the ``ansible`` deploy interface and instance images with GPT partition + table. |