summaryrefslogtreecommitdiff
path: root/morphlib/app.py
diff options
context:
space:
mode:
Diffstat (limited to 'morphlib/app.py')
-rw-r--r--morphlib/app.py30
1 files changed, 26 insertions, 4 deletions
diff --git a/morphlib/app.py b/morphlib/app.py
index 293b8517..2ec98dab 100644
--- a/morphlib/app.py
+++ b/morphlib/app.py
@@ -125,6 +125,22 @@ class Morph(cliapp.Application):
metavar='URL',
default=None,
group=group_advanced)
+ self.settings.string(['union-filesystem'],
+ 'filesystem used to provide "union filesystem" '
+ 'functionality when building and deploying. '
+ 'Only "overlayfs" and "unionfs-fuse" are '
+ 'supported at this time.',
+ default='overlayfs',
+ group=group_advanced)
+ self.settings.string(['ostree-repo-mode'],
+ 'Mode for OSTree artifact cache repository. If '
+ 'things will need to pull from your cache, this '
+ 'needs to be "archive_z2". Otherwise use '
+ '"bare". Note that archive_z2 will cause things '
+ 'involving the artifact cache (building and/or '
+ 'deploying) to be slow.',
+ default='bare',
+ group=group_advanced)
group_build = 'Build Options'
self.settings.integer(['max-jobs'],
@@ -159,12 +175,19 @@ class Morph(cliapp.Application):
'or /tmp because those are used internally '
'by things that cannot be on NFS, but '
'this setting can point at a directory in '
- 'NFS)',
+ 'NFS). If cachedir and tempdir are on separate '
+ 'filesystems, you will experience poor '
+ 'performance when building and deploying '
+ 'systems.',
metavar='DIR',
default=None,
group=group_storage)
self.settings.string(['cachedir'],
- 'cache git repositories and build results in DIR',
+ 'cache git repositories and build results in DIR.'
+ 'If cachedir and tempdir are on separate '
+ 'filesystems, you will experience poor '
+ 'performance when building and deploying '
+ 'systems.',
metavar='DIR',
group=group_storage,
default=defaults['cachedir'])
@@ -273,8 +296,7 @@ class Morph(cliapp.Application):
sys.exit(0)
tmpdir = self.settings['tempdir']
- for required_dir in (os.path.join(tmpdir, 'chunks'),
- os.path.join(tmpdir, 'staging'),
+ for required_dir in (os.path.join(tmpdir, 'staging'),
os.path.join(tmpdir, 'failed'),
os.path.join(tmpdir, 'deployments'),
self.settings['cachedir']):