p/fuel: Drop upstream nova patch for virtio-video

Change-Id: I12ac18f4348e8aecca2a1934a69ef7ebfa8f0c95
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

2 files changed, 19 insertions, 69 deletions

diff --git a/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch
index 185a3350..325130b7 100644
--- a/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch
+++ b/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch
@@ -26,16 +26,16 @@ Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com>
 Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
- mcp/config/states/openstack_ha                |   1 +
- mcp/config/states/openstack_noha              |   2 +
- mcp/config/states/virtual_control_plane       |   1 +
- .../files/nova-libvirt-aarch64-rollup.diff    | 106 ++++++++++++++++++
- mcp/salt-formulas/armband/init.sls            |   7 ++
- mcp/salt-formulas/armband/nova_config.sls     |  35 ++++++
- mcp/salt-formulas/armband/nova_libvirt.sls    |   7 ++
- mcp/salt-formulas/armband/qemu_efi.sls        |   2 +
- mcp/salt-formulas/armband/vgabios.sls         |   7 ++
- 9 files changed, 168 insertions(+)
+ mcp/config/states/openstack_ha                |  1 +
+ mcp/config/states/openstack_noha              |  2 +
+ mcp/config/states/virtual_control_plane       |  1 +
+ .../files/nova-libvirt-aarch64-rollup.diff    | 60 +++++++++++++++++++
+ mcp/salt-formulas/armband/init.sls            |  7 +++
+ mcp/salt-formulas/armband/nova_config.sls     | 35 +++++++++++
+ mcp/salt-formulas/armband/nova_libvirt.sls    |  7 +++
+ mcp/salt-formulas/armband/qemu_efi.sls        |  2 +
+ mcp/salt-formulas/armband/vgabios.sls         |  7 +++
+ 9 files changed, 122 insertions(+)
  create mode 100644 mcp/salt-formulas/armband/files/nova-libvirt-aarch64-rollup.diff
  create mode 100644 mcp/salt-formulas/armband/init.sls
  create mode 100644 mcp/salt-formulas/armband/nova_config.sls
@@ -79,10 +79,10 @@ index c391cfe6..02a813c9 100755
  salt -C 'kvm* or cmp*' state.apply salt
 diff --git a/mcp/salt-formulas/armband/files/nova-libvirt-aarch64-rollup.diff b/mcp/salt-formulas/armband/files/nova-libvirt-aarch64-rollup.diff
 new file mode 100644
-index 00000000..c987a4ce
+index 00000000..d5ba2aca
 --- /dev/null
 +++ b/mcp/salt-formulas/armband/files/nova-libvirt-aarch64-rollup.diff
-@@ -0,0 +1,106 @@
+@@ -0,0 +1,60 @@
 +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 +Date: Thu, 24 Aug 2017 10:57:28 +0200
 +Subject: [PATCH] libvirt: AArch64: ACPI depends on AAVMF
@@ -115,52 +115,6 @@ index 00000000..c987a4ce
 +         if (virt_type in ("qemu", "kvm") and
 +--
 +
-+From f0f09530ee9169eb29bc28d4f118676d7dc6640e Mon Sep 17 00:00:00 2001
-+From: Kevin Zhao <kevin.zhao@arm.com>
-+Date: Tue, 15 Aug 2017 09:52:09 +0000
-+Subject: [PATCH] Add video type virtio for AArch64
-+
-+Currently only "virtio" type is supported on AArch64, and the
-+other "virrus", "qxl" and "vga" don't work on AArch64 according to
-+libvirt upstream:
-+https://www.redhat.com/archives/libvir-list/2016-September/msg00546.html
-+Then this patch adds the virtio for AArch64 and tweaks the related test cases.
-+
-+Closes-bug: #1710766
-+
-+[ Alexandru.Avadanii@enea.com ]
-+Dropped test changes so it applies cleanly on Newton without more backports.
-+
-+Change-Id: Iba8a1e671f2b5759b3d9178aa1871d0cf888b26b
-+Signed-off-by: Kevin Zhao <kevin.zhao@arm.com>
-+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-+---
-+
-+--- a/nova/virt/libvirt/driver.py
-++++ b/nova/virt/libvirt/driver.py
-+@@ -4342,7 +4342,8 @@ def _check_number_of_serial_console(self, num_ports):
-+                 allowed=ALLOWED_QEMU_SERIAL_PORTS, virt_type=virt_type)
-+
-+     def _add_video_driver(self, guest, image_meta, flavor):
-+-        VALID_VIDEO_DEVICES = ("vga", "cirrus", "vmvga", "xen", "qxl")
-++        VALID_VIDEO_DEVICES = ("vga", "cirrus", "vmvga",
-++                               "xen", "qxl", "virtio")
-+         video = vconfig.LibvirtConfigGuestVideo()
-+         # NOTE(ldbragst): The following logic sets the video.type
-+         # depending on supported defaults given the architecture,
-+@@ -4360,6 +4361,10 @@ def _add_video_driver(self, guest, image_meta, flavor):
-+             # NOTE(ldbragst): PowerKVM doesn't support 'cirrus' be default
-+             # so use 'vga' instead when running on Power hardware.
-+             video.type = 'vga'
-++        elif guestarch in (fields.Architecture.AARCH64):
-++            # NOTE(kevinz): Only virtio device type is supported by AARCH64
-++            # so use 'virtio' instead when running on AArch64 hardware.
-++            video.type = 'virtio'
-+         elif CONF.spice.enabled:
-+             video.type = 'qxl'
-+         if image_meta.properties.get('hw_video_model'):
-+--
-+
 +From dbd4c20de002784a4ffc07b173e82dd84a3af01c Mon Sep 17 00:00:00 2001
 +From: Charalampos Kominos <Charalampos.Kominos@enea.com>
 +Date: Wed, 2 May 2018 14:20:47 +0200
diff --git a/patches/opnfv-fuel/0006-Set-volume-name-in-source-file-to-sdX.patch b/patches/opnfv-fuel/0006-Set-volume-name-in-source-file-to-sdX.patch
index 21e1bcac..28a8d288 100644
--- a/patches/opnfv-fuel/0006-Set-volume-name-in-source-file-to-sdX.patch
+++ b/patches/opnfv-fuel/0006-Set-volume-name-in-source-file-to-sdX.patch
@@ -12,9 +12,9 @@ Subject: [PATCH] Set volume name in source file to sdX
 
 Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
 ---
- .../cluster/mcp-pike-common-ha/openstack_control.yml.j2     | 2 +-
- .../cluster/mcp-pike-common-noha/openstack_control.yml      | 6 ++++++
- 2 files changed, 7 insertions(+), 1 deletion(-)
+ .../classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 | 2 +-
+ .../classes/cluster/mcp-pike-common-noha/openstack_control.yml  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2
 index 6f7b33e3..dfc212e2 100644
@@ -30,19 +30,15 @@ index 6f7b33e3..dfc212e2 100644
      server:
        control:
 diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml
-index 1c94738a..74667e21 100644
+index 1c94738a..5c8be6bc 100644
 --- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml
 +++ b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml
-@@ -58,6 +58,12 @@ parameters:
+@@ -57,7 +57,7 @@ parameters:
+     server:
        admin_email: ${_param:admin_email}
        openrc_extra:
-         volume_device_name: vdc
+-        volume_device_name: vdc
 +        volume_device_name: sdc
-+      pkgs:
-+        - keystone
-+        - python-psycopg2
-+        - python-mysqldb
-+        - python-openstackclient
    glance:
      server:
        storage: