summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-02-27 22:19:02 +0000
committerGerrit Code Review <review@openstack.org>2013-02-27 22:19:02 +0000
commit13fdda6e641a9e507b72ebfe8bd36c9800325bc3 (patch)
tree51a1ffcf74af800876a0a1d44e2f7c20beb889e0
parente7ff1c1dc137c097f1bee607d036dee7c70e1ff7 (diff)
parent3036eb4fea76a389eb7f8a13251f19076e3a7d8c (diff)
downloadnova-13fdda6e641a9e507b72ebfe8bd36c9800325bc3.tar.gz
nova-13fdda6e641a9e507b72ebfe8bd36c9800325bc3.tar.xz
nova-13fdda6e641a9e507b72ebfe8bd36c9800325bc3.zip
Merge "Makes sure required powervm config options are set"
-rwxr-xr-xnova/virt/powervm/driver.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/nova/virt/powervm/driver.py b/nova/virt/powervm/driver.py
index 892ac34ef..ece04fa93 100755
--- a/nova/virt/powervm/driver.py
+++ b/nova/virt/powervm/driver.py
@@ -41,11 +41,13 @@ powervm_opts = [
help='PowerVM manager user password',
secret=True),
cfg.StrOpt('powervm_img_remote_path',
- default=None,
- help='PowerVM image remote path'),
+ default='/home/padmin',
+ help='PowerVM image remote path where images will be moved.'
+ ' Make sure this path can fit your biggest image in glance'),
cfg.StrOpt('powervm_img_local_path',
- default=None,
- help='Local directory to download glance images to')
+ default='/tmp',
+ help='Local directory to download glance images to.'
+ ' Make sure this path can fit your biggest image in glance')
]
CONF = cfg.CONF