Merge "Build images with a 4k block size filesystem" into stable/queens
This commit is contained in:
commit
4d8ca16527
|
@ -9,6 +9,8 @@ disk_images:
|
||||||
FS_TYPE: xfs
|
FS_TYPE: xfs
|
||||||
packages:
|
packages:
|
||||||
- yum-plugin-priorities
|
- yum-plugin-priorities
|
||||||
|
options:
|
||||||
|
- "--mkfs-options '-s size=4096'"
|
||||||
-
|
-
|
||||||
imagename: ironic-python-agent
|
imagename: ironic-python-agent
|
||||||
type: qcow2
|
type: qcow2
|
||||||
|
|
|
@ -5,6 +5,8 @@ disk_images:
|
||||||
distro: rhel7
|
distro: rhel7
|
||||||
environment:
|
environment:
|
||||||
FS_TYPE: xfs
|
FS_TYPE: xfs
|
||||||
|
options:
|
||||||
|
- "--mkfs-options '-s size=4096'"
|
||||||
-
|
-
|
||||||
imagename: ironic-python-agent
|
imagename: ironic-python-agent
|
||||||
type: qcow2
|
type: qcow2
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
import abc
|
import abc
|
||||||
import logging
|
import logging
|
||||||
import os
|
import os
|
||||||
|
import shlex
|
||||||
import six
|
import six
|
||||||
import subprocess
|
import subprocess
|
||||||
import sys
|
import sys
|
||||||
|
@ -94,7 +95,7 @@ class DibImageBuilder(ImageBuilder):
|
||||||
|
|
||||||
if options:
|
if options:
|
||||||
for option in options:
|
for option in options:
|
||||||
cmd.extend(option.split(' '))
|
cmd.extend(shlex.split(option))
|
||||||
|
|
||||||
skip_base = extra_options.get('skip_base', False)
|
skip_base = extra_options.get('skip_base', False)
|
||||||
if skip_base:
|
if skip_base:
|
||||||
|
|
Loading…
Reference in New Issue