Browse Source

Merge "Build images with a 4k block size filesystem" into stable/queens

changes/37/560337/1
Zuul 4 years ago
committed by Gerrit Code Review
parent
commit
4d8ca16527
  1. 2
      image-yaml/overcloud-images-centos7.yaml
  2. 2
      image-yaml/overcloud-images-rhel7.yaml
  3. 3
      tripleo_common/image/image_builder.py

2
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

2
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

3
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:

Loading…
Cancel
Save