summaryrefslogtreecommitdiffstats
path: root/deploy/prepare
diff options
context:
space:
mode:
authorZhijiang Hu <hu.zhijiang@zte.com.cn>2017-06-08 06:32:12 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-06-08 06:32:12 +0000
commite0d6c8a4e5c84bedbcbe91ca51c8bbabf1d8fdf8 (patch)
tree0fdc10b2e28df190a470feb4627e3ca1303d4890 /deploy/prepare
parent420e2a340d66c481353683210f02ba06ba056433 (diff)
parent539a587a9096e522a10f51740c8c9422c03f56d9 (diff)
Merge "Set compute to qemu only in virtual deployment"
Diffstat (limited to 'deploy/prepare')
-rw-r--r--deploy/prepare/execute.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/deploy/prepare/execute.py b/deploy/prepare/execute.py
index 67c31b1b..2b46119d 100644
--- a/deploy/prepare/execute.py
+++ b/deploy/prepare/execute.py
@@ -39,7 +39,7 @@ def _config_service(service, subs):
@_config_service('nova', ['compute'])
-def _set_default_compute():
+def _set_qemu_compute():
return '[libvirt]\n' \
'virt_type=qemu\n' \
'cpu_mode=none\n'
@@ -65,8 +65,15 @@ def main():
type=str,
required=True,
help='network configuration file')
+ parser.add_argument('-b', '--is-baremetal',
+ type=str,
+ required=True,
+ help='0 for virtual, 1 for baremetal')
args = parser.parse_args()
- _set_default_compute()
+
+ if args.is_baremetal == '0':
+ _set_qemu_compute()
+
_set_default_floating_pool(args.network_file)
_set_trusts_auth()