summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRadostin Stoyanov <rstoyanov1@gmail.com>2017-08-03 14:12:59 +0100
committerRadostin Stoyanov <rstoyanov1@gmail.com>2017-08-03 14:27:40 +0100
commit09d8ad1e87cae5954f521bc1ef50ac071f36d404 (patch)
tree7584ec0d1d8bc8d062a537223038e22b860d71c6
parent4df6e8f3aab081b40a07bdcb6ca8b24330ed7e59 (diff)
downloadvirt-bootstrap.git-09d8ad1e87cae5954f521bc1ef50ac071f36d404.tar.gz
virt-bootstrap.git-09d8ad1e87cae5954f521bc1ef50ac071f36d404.tar.xz
virt-bootstrap.git-09d8ad1e87cae5954f521bc1ef50ac071f36d404.zip
sources: Set default format with a constant
-rw-r--r--src/virtBootstrap/utils.py2
-rwxr-xr-xsrc/virtBootstrap/virt_bootstrap.py4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/virtBootstrap/utils.py b/src/virtBootstrap/utils.py
index 2c79d6b..dbe4677 100644
--- a/src/virtBootstrap/utils.py
+++ b/src/virtBootstrap/utils.py
@@ -38,6 +38,8 @@ import passlib.hosts
# pylint: disable=invalid-name
# Create logger
logger = logging.getLogger(__name__)
+
+DEFAULT_OUTPUT_FORMAT = 'dir'
# Default virtual size of qcow2 image
DEF_QCOW2_SIZE = '5G'
if os.geteuid() == 0:
diff --git a/src/virtBootstrap/virt_bootstrap.py b/src/virtBootstrap/virt_bootstrap.py
index c9bf1c8..ddc5456 100755
--- a/src/virtBootstrap/virt_bootstrap.py
+++ b/src/virtBootstrap/virt_bootstrap.py
@@ -165,7 +165,7 @@ def mapping_uid_gid(dest, uid_map, gid_map):
# pylint: disable=too-many-arguments
def bootstrap(uri, dest,
- fmt='dir',
+ fmt=utils.DEFAULT_OUTPUT_FORMAT,
username=None,
password=None,
root_password=None,
@@ -267,7 +267,7 @@ def main():
help=_("Map both UIDs/GIDs"))
parser.add_argument("--no-cache", action="store_true",
help=_("Do not store downloaded Docker images"))
- parser.add_argument("-f", "--format", default='dir',
+ parser.add_argument("-f", "--format", default=utils.DEFAULT_OUTPUT_FORMAT,
choices=['dir', 'qcow2'],
help=_("Format to be used for the root filesystem"))
parser.add_argument("-d", "--debug", action="store_const", dest="loglevel",