From f90649b842940905bfd2802215425b0308cd0d14 Mon Sep 17 00:00:00 2001 From: Mike Shriver Date: Mon, 10 Jun 2019 21:53:00 -0400 Subject: [PATCH 1/2] Update template upload for rhevm, name database disk --- cfme/utils/template/rhevm.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cfme/utils/template/rhevm.py b/cfme/utils/template/rhevm.py index 27ea636486..076742da4b 100644 --- a/cfme/utils/template/rhevm.py +++ b/cfme/utils/template/rhevm.py @@ -78,9 +78,10 @@ def add_disk_to_vm(self): return rhevm_specs = cfme_data.template_upload.template_upload_rhevm disk_kwargs = dict(storage_domain=self.provider_data.template_upload.storage_domain, - size=rhevm_specs.disk_size, - interface=rhevm_specs.disk_interface, - format=rhevm_specs.disk_format) + size=rhevm_specs.get('disk_size', 5000000000), + interface=rhevm_specs.get('disk_interface', 'virtio'), + format=rhevm_specs.get('disk_format', 'cow'), + name=rhevm_specs.get('disk_name')) temp_vm.add_disk(**disk_kwargs) # check, if there are two disks if temp_vm.get_disks_count() < 2: From 98bec32b671dfba4c8a5d439159e7c2f688d6e62 Mon Sep 17 00:00:00 2001 From: Mike Shriver Date: Tue, 25 Jun 2019 10:38:09 -0400 Subject: [PATCH 2/2] Update wrapanapi to 3.2.1 --- requirements/frozen.py2.txt | 2 +- requirements/frozen.py3.txt | 2 +- requirements/frozen_docs.py2.txt | 2 +- requirements/frozen_docs.py3.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements/frozen.py2.txt b/requirements/frozen.py2.txt index 865023dfdf..ec50665b91 100644 --- a/requirements/frozen.py2.txt +++ b/requirements/frozen.py2.txt @@ -329,7 +329,7 @@ Werkzeug==0.15.2 widgetastic.core==0.39 widgetastic.patternfly==0.1.4 widgetsnbextension==3.4.2 -wrapanapi==3.2.0 +wrapanapi==3.2.1 wrapt==1.11.1 xmltodict==0.12.0 yaycl==0.3.0 diff --git a/requirements/frozen.py3.txt b/requirements/frozen.py3.txt index 9be4536299..2133da2d08 100644 --- a/requirements/frozen.py3.txt +++ b/requirements/frozen.py3.txt @@ -314,7 +314,7 @@ Werkzeug==0.15.2 widgetastic.core==0.39 widgetastic.patternfly==0.1.4 widgetsnbextension==3.4.2 -wrapanapi==3.2.0 +wrapanapi==3.2.1 wrapt==1.11.1 xmltodict==0.12.0 yaycl==0.3.0 diff --git a/requirements/frozen_docs.py2.txt b/requirements/frozen_docs.py2.txt index c80079f0af..4e35ab7009 100644 --- a/requirements/frozen_docs.py2.txt +++ b/requirements/frozen_docs.py2.txt @@ -328,7 +328,7 @@ Werkzeug==0.15.2 widgetastic.core==0.39 widgetastic.patternfly==0.1.4 widgetsnbextension==3.4.2 -wrapanapi==3.2.0 +wrapanapi==3.2.1 wrapt==1.11.1 xmltodict==0.12.0 yaycl==0.3.0 diff --git a/requirements/frozen_docs.py3.txt b/requirements/frozen_docs.py3.txt index 04a173078f..1fbb529287 100644 --- a/requirements/frozen_docs.py3.txt +++ b/requirements/frozen_docs.py3.txt @@ -313,7 +313,7 @@ Werkzeug==0.15.2 widgetastic.core==0.39 widgetastic.patternfly==0.1.4 widgetsnbextension==3.4.2 -wrapanapi==3.2.0 +wrapanapi==3.2.1 wrapt==1.11.1 xmltodict==0.12.0 yaycl==0.3.0