From 85c4bad1eaf263aa9fb757f07576a5308ab1db67 Mon Sep 17 00:00:00 2001
From: Lennart Regebro <lregebro@redhat.com>
Date: Tue, 25 Aug 2015 15:21:24 -0400
Subject: [PATCH] Change libvirt default to kvm

Also only list qemu and kvm as options, as those are the only
ones we support, even though others would be passed through
and might work.

Change-Id: Ifaedd7d3d2cc5fd03465b9110f865daaca6e9fd0
Closes-bug: https://bugzilla.redhat.com/show_bug.cgi?id=1243601
---
 doc/source/command-objects/overcloud.rst                   | 4 ++--
 .../tests/v1/overcloud_deploy/test_overcloud_deploy.py     | 2 +-
 rdomanager_oscplugin/v1/overcloud_deploy.py                | 7 ++++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/doc/source/command-objects/overcloud.rst b/doc/source/command-objects/overcloud.rst
index 09a209cb3..624bcab60 100644
--- a/doc/source/command-objects/overcloud.rst
+++ b/doc/source/command-objects/overcloud.rst
@@ -144,9 +144,9 @@ Deploy an overcloud stack
     An ordered list of extension driver entrypoints to be loaded from the
     neutron.ml2.extension_drivers namespace.
 
-.. option:: --libvirt-type [kvm|lxc|qemu|uml|xen|parallels]
+.. option:: --libvirt-type {kvm,qemu}
 
-    Libvirt domain type. (default: qemu)
+    Libvirt domain type. (default: kvm)
 
 .. option:: --ntp-server <ip-address>
 
diff --git a/rdomanager_oscplugin/tests/v1/overcloud_deploy/test_overcloud_deploy.py b/rdomanager_oscplugin/tests/v1/overcloud_deploy/test_overcloud_deploy.py
index 7e68525f1..17296fa87 100644
--- a/rdomanager_oscplugin/tests/v1/overcloud_deploy/test_overcloud_deploy.py
+++ b/rdomanager_oscplugin/tests/v1/overcloud_deploy/test_overcloud_deploy.py
@@ -298,7 +298,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
             'NeutronTunnelIdRanges': '1:1000',
             'NeutronTunnelTypes': 'gre',
             'NeutronVniRanges': '1:1000',
-            'NovaComputeLibvirtType': 'qemu',
+            'NovaComputeLibvirtType': 'kvm',
             'NovaImage': 'overcloud-full',
             'NovaPassword': 'password',
             'NtpServer': '',
diff --git a/rdomanager_oscplugin/v1/overcloud_deploy.py b/rdomanager_oscplugin/v1/overcloud_deploy.py
index e4e1b4aea..43a430854 100644
--- a/rdomanager_oscplugin/v1/overcloud_deploy.py
+++ b/rdomanager_oscplugin/v1/overcloud_deploy.py
@@ -81,7 +81,7 @@ PARAMETERS = {
 }
 
 NEW_STACK_PARAMETERS = {
-    'NovaComputeLibvirtType': 'qemu',
+    'NovaComputeLibvirtType': 'kvm',
     'NeutronTunnelIdRanges': '1:1000',
     'NeutronVniRanges': '1:1000',
     'NeutronEnableTunnelling': 'True',
@@ -793,8 +793,9 @@ class DeployOvercloud(command.Command):
                                    'entrypoints to be loaded from the '
                                    'neutron.ml2.extension_drivers namespace.'))
         parser.add_argument('--libvirt-type',
-                            help=_('Libvirt domain type. (default: qemu) '
-                                   '[qemu|kvm|lxc|uml|xen|parallels]'))
+                            default='kvm',
+                            choices=['kvm', 'qemu'],
+                            help=_('Libvirt domain type. (default: kvm)'))
         parser.add_argument('--ntp-server',
                             help=_('The NTP for overcloud nodes.'))
         parser.add_argument(