From c5b33dd841f1b0f41dc824b06cbeeb219d4be954 Mon Sep 17 00:00:00 2001 From: Derek Higgins Date: Thu, 1 Feb 2018 13:21:48 +0000 Subject: [PATCH] Build images with a 4k block size filesystem This will support both 512b and 4k disks. Change-Id: I1e64647b3de86bc87a2a04cedf54ac83bbd4963d Depends-On: Iac57d604fa49b6dab836001daba36da0685aed74 Closes-Bug: #1746727 (cherry picked from commit 4db452746c63a81145e706ee6e67bd7b10c2ad2b) --- image-yaml/overcloud-images-centos7.yaml | 2 ++ image-yaml/overcloud-images-rhel7.yaml | 2 ++ tripleo_common/image/image_builder.py | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/image-yaml/overcloud-images-centos7.yaml b/image-yaml/overcloud-images-centos7.yaml index 948cc143c..64b31d418 100644 --- a/image-yaml/overcloud-images-centos7.yaml +++ b/image-yaml/overcloud-images-centos7.yaml @@ -9,6 +9,8 @@ disk_images: FS_TYPE: xfs packages: - yum-plugin-priorities + options: + - "--mkfs-options '-s size=4096'" - imagename: ironic-python-agent type: qcow2 diff --git a/image-yaml/overcloud-images-rhel7.yaml b/image-yaml/overcloud-images-rhel7.yaml index 8bc6b8e0c..59e5ad6b1 100644 --- a/image-yaml/overcloud-images-rhel7.yaml +++ b/image-yaml/overcloud-images-rhel7.yaml @@ -5,6 +5,8 @@ disk_images: distro: rhel7 environment: FS_TYPE: xfs + options: + - "--mkfs-options '-s size=4096'" - imagename: ironic-python-agent type: qcow2 diff --git a/tripleo_common/image/image_builder.py b/tripleo_common/image/image_builder.py index 010561993..06d7b76ea 100644 --- a/tripleo_common/image/image_builder.py +++ b/tripleo_common/image/image_builder.py @@ -17,6 +17,7 @@ import abc import logging import os +import shlex import six import subprocess import sys @@ -94,7 +95,7 @@ class DibImageBuilder(ImageBuilder): if options: for option in options: - cmd.extend(option.split(' ')) + cmd.extend(shlex.split(option)) skip_base = extra_options.get('skip_base', False) if skip_base: