From f769c66bc16f5f31321f94c996e54894c69b0d3e Mon Sep 17 00:00:00 2001
From: Spaceman1984 <49917670+Spaceman1984@users.noreply.github.com>
Date: Fri, 7 Feb 2020 07:34:20 +0200
Subject: [PATCH 1/2] ui: fix default text missing from network selection on
 instance wizard (#3865)

This PR fixes the missing "Default" display issue on the instance wizard when selecting a network.

Fixes: #3633
---
 ui/scripts/ui-custom/instanceWizard.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ui/scripts/ui-custom/instanceWizard.js b/ui/scripts/ui-custom/instanceWizard.js
index 4fa7e3fc76c..b732b9ccf4b 100644
--- a/ui/scripts/ui-custom/instanceWizard.js
+++ b/ui/scripts/ui-custom/instanceWizard.js
@@ -330,9 +330,8 @@
                                             .attr('checked', false);
                                     }
                                 })
-                                .after(
-                                    $('<div>').addClass('name').html(options.secondary.desc)
-                                )
+                            ).append(
+                                $('<div>').addClass('name').html(options.secondary.desc)
                             ).appendTo($select);
                         }
                     });

From cd55674afe9ffe1729596524cc0b14679e7e30f6 Mon Sep 17 00:00:00 2001
From: Wei Zhou <w.zhou@global.leaseweb.com>
Date: Fri, 7 Feb 2020 06:37:18 +0100
Subject: [PATCH 2/2] packaging: install python-dnspython or python-dns to fix
 issue with cloudstack-setup-management (#3854)

Fixes #3817 #3841

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
---
 debian/control               | 2 +-
 packaging/centos7/cloud.spec | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 4e8742b4a2e..4a510155d56 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Description: A common package which contains files which are shared by several C
 
 Package: cloudstack-management
 Architecture: all
-Depends: ${python:Depends}, openjdk-8-jre-headless | java8-runtime-headless | java8-runtime | openjdk-9-jre-headless, cloudstack-common (= ${source:Version}), sudo, python-mysql.connector, libmysql-java, augeas-tools, mysql-client, adduser, bzip2, ipmitool, file, lsb-release, init-system-helpers (>= 1.14~)
+Depends: ${python:Depends}, openjdk-8-jre-headless | java8-runtime-headless | java8-runtime | openjdk-9-jre-headless, cloudstack-common (= ${source:Version}), sudo, python-mysql.connector, libmysql-java, augeas-tools, mysql-client, adduser, bzip2, ipmitool, file, gawk, iproute2, lsb-release, init-system-helpers (>= 1.14~), qemu-utils, python-dnspython
 Conflicts: cloud-server, cloud-client, cloud-client-ui
 Description: CloudStack server library
  The CloudStack management server
diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec
index 0643423f2b6..65f3fcee629 100644
--- a/packaging/centos7/cloud.spec
+++ b/packaging/centos7/cloud.spec
@@ -74,6 +74,8 @@ Requires: mysql-connector-python
 Requires: ipmitool
 Requires: %{name}-common = %{_ver}
 Requires: iptables-services
+Requires: qemu-img
+Requires: python-dns
 Group:     System Environment/Libraries
 %description management
 The CloudStack management server is the central point of coordination,