[Libguestfs] [p2v PATCH v2 10/11] Reenable the OpenStack output mode
With "-oo" exposed on the GUI, the reason for disabling the openstack
driver (from commit b74c126629e3, "Ignore 'openstack' driver",
2020-03-16)
is gone. Reenable the driver.
At the same time, add two small openstack-related hints to the GUI.
Cc: Alban Lecorps <alban.lecorps(a)ubisoft.com>
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1792141
Signed-off-by: Laszlo Ersek <lersek(a)redhat.com>
---
Notes:
v2:
- manually resolve the tooltip conflict coming from the update to the
previous patch
gui.c | 5 ++++-
ssh.c | 5 ++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/gui.c b/gui.c
index ce9b2455e666..a0cd60979659 100644
--- a/gui.c
+++ b/gui.c
@@ -848,6 +848,8 @@ create_conversion_dialog (struct config *config,
"<b>local</b> means put it in a
directory "
"on the conversion server. "
"<b>rhv</b> means write it to
RHV-M/oVirt. "
+ "<b>openstack</b> means write it to
"
+ "OpenStack. "
"<b>glance</b> means write it to
OpenStack "
"Glance. "
"See the virt-v2v(1) manual page for more "
@@ -944,7 +946,8 @@ create_conversion_dialog (struct config *config,
"virt-v2v as the argument of a separate "
"<b>-oo</b> option. Do not place a
space "
"character at either side of either comma "
- "separator."));
+ "separator. Mainly useful for "
+ "<b>openstack</b>."));
populate_misc_opts (GTK_ENTRY (oo_entry), config->output.misc);
table_attach (output_tbl, oo_entry,
1, 2, row, GTK_FILL, GTK_FILL, 1, 1);
diff --git a/ssh.c b/ssh.c
index 513a20318359..ec44e77895a5 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1015,11 +1015,10 @@ static void
add_output_driver (const char *name)
{
/* Ignore the 'vdsm' driver, since that should only be used by VDSM.
- * Ignore the 'openstack' and 'rhv-upload' drivers, since we do not
- * support passing all the options for them.
+ * Ignore the 'rhv-upload' driver, since we do not support passing all the
+ * options for it.
*/
if (STRNEQ (name, "vdsm") &&
- STRNEQ (name, "openstack") &&
STRNEQ (name, "rhv-upload"))
add_option ("output", &output_drivers, name);
}