summaryrefslogtreecommitdiffstats
path: root/patches/fuel-web
diff options
context:
space:
mode:
Diffstat (limited to 'patches/fuel-web')
-rw-r--r--patches/fuel-web/0001-nailgun-Add-AArch64-Openstack-Newton-release-s.patch373
-rw-r--r--patches/fuel-web/0002-Add-arch-to-nailgun-release-and-target-image.patch330
-rw-r--r--patches/fuel-web/0003-AArch64-Cirros-TestVM-Use-AAVMF-guest-UEFI.patch36
-rw-r--r--patches/fuel-web/0004-nailgun-Openstack-release-Pin-kernel-to-4.8.0-9944.patch68
-rw-r--r--patches/fuel-web/0005-Update-Host-OS-NTP-Servers-to-pool.ntp.org.patch36
-rw-r--r--patches/fuel-web/0006-nailgun-Add-NIC-vendorid-and-device-id-for-Cavium-NI.patch50
l---------patches/fuel-web/cross-bootstrap/0000-Add-arch-to-nailgun-release-and-target-image.patch1
l---------patches/fuel-web/multiarch-fuel/0000-Add-arch-to-nailgun-release-and-target-image.patch1
l---------patches/fuel-web/multiarch-fuel/0000-nailgun-Add-AArch64-Openstack-Newton-release-s.patch1
-rw-r--r--patches/fuel-web/multiarch-fuel/0001-FIXME-Disable-amd64-Newton-on-Ubuntu-for-now.patch40
-rw-r--r--patches/fuel-web/mysql-sst-provider/0001-Add-configuration-item-for-WSREP-SST-provider.patch53
11 files changed, 0 insertions, 989 deletions
diff --git a/patches/fuel-web/0001-nailgun-Add-AArch64-Openstack-Newton-release-s.patch b/patches/fuel-web/0001-nailgun-Add-AArch64-Openstack-Newton-release-s.patch
deleted file mode 100644
index 3c887278..00000000
--- a/patches/fuel-web/0001-nailgun-Add-AArch64-Openstack-Newton-release-s.patch
+++ /dev/null
@@ -1,373 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2017 Enea AB, Cavium and others.
-:
-: All rights reserved. This program and the accompanying materials
-: are made available under the terms of the Apache License, Version 2.0
-: which accompanies this distribution, and is available at
-: http://www.apache.org/licenses/LICENSE-2.0
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Sun, 18 Dec 2016 21:08:42 +0100
-Subject: [PATCH] nailgun: Add AArch64 Openstack Newton release(s).
-
-Add the following Openstack releases:
-- Newton on Ubuntu 16.04 (aarch64)
-- Newton on Ubuntu+UCA 16.04 (aarch64)
-
-Signed-off-by: Stanislaw Kardach <stanislaw.kardach@cavium.com>
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- nailgun/nailgun/fixtures/openstack.yaml | 343 ++++++++++++++++++++++++++++++++
- 1 file changed, 343 insertions(+)
-
-diff --git a/nailgun/nailgun/fixtures/openstack.yaml b/nailgun/nailgun/fixtures/openstack.yaml
-index eb33db2..ba967d7 100644
---- a/nailgun/nailgun/fixtures/openstack.yaml
-+++ b/nailgun/nailgun/fixtures/openstack.yaml
-@@ -2511,3 +2511,346 @@
- weight: 61
- type: "checkbox"
- value: true
-+- &ubuntu_aarch64_xenial
-+ pk: 4
-+ extend: *base_release
-+ fields:
-+ name: "Newton on Ubuntu 16.04 (aarch64)"
-+ version: "newton-10.0"
-+ operating_system: "Ubuntu"
-+ description: "This option will install the OpenStack Newton packages using Ubuntu as a base operating system. With high availability features built in, you are getting a robust, enterprise-grade OpenStack deployment."
-+ attributes_metadata:
-+ editable:
-+ kernel_params:
-+ kernel:
-+ value: "console=ttyAMA0,115200 console=ttyS0,115200 console=tty0 net.ifnames=1 biosdevname=0 rootdelay=90 nomodeset"
-+ repo_setup:
-+ metadata:
-+ label: "Repositories"
-+ weight: 50
-+ group: "general"
-+ always_editable: true
-+ repos:
-+ type: "custom_repo_configuration"
-+ extra_priority: null
-+ description: |
-+ Please note: the first repository will be considered the operating system mirror that will be used during node provisioning.
-+ To create a local repository mirror on the Fuel master node, please follow the instructions provided by running "fuel-createmirror --help" on the Fuel master node.
-+ Please make sure your Fuel master node has Internet access to the repository before attempting to create a mirror.
-+ value:
-+ - type: "deb"
-+ name: "ubuntu-local"
-+ uri: "http://{settings.MASTER_IP}:8080/mirrors/ubuntu"
-+ suite: "xenial"
-+ section: "main"
-+ priority: null
-+ - type: "deb"
-+ name: "ubuntu"
-+ uri: "http://ports.ubuntu.com/"
-+ suite: "xenial"
-+ section: "main universe multiverse"
-+ priority: null
-+ - type: "deb"
-+ name: "ubuntu-updates"
-+ uri: "http://ports.ubuntu.com/"
-+ suite: "xenial-updates"
-+ section: "main universe multiverse"
-+ priority: null
-+ - type: "deb"
-+ name: "ubuntu-security"
-+ uri: "http://ports.ubuntu.com/"
-+ suite: "xenial-security"
-+ section: "main universe multiverse"
-+ priority: null
-+ - type: "deb"
-+ name: "mos"
-+ uri: "http://{settings.MASTER_IP}:8080/{cluster.release.version}/ubuntu/x86_64"
-+ suite: "mos10.0"
-+ section: "main restricted"
-+ priority: 1050
-+ - type: "deb"
-+ name: "mos-updates"
-+ uri: "http://linux.enea.com/mos-repos/ubuntu/{cluster.release.environment_version}"
-+ suite: "mos10.0-updates"
-+ section: "main restricted"
-+ priority: 1050
-+ - type: "deb"
-+ name: "mos-security"
-+ uri: "http://linux.enea.com/mos-repos/ubuntu/{cluster.release.environment_version}"
-+ suite: "mos10.0-security"
-+ section: "main restricted"
-+ priority: 1050
-+ - type: "deb"
-+ name: "mos-holdback"
-+ uri: "http://linux.enea.com/mos-repos/ubuntu/{cluster.release.environment_version}"
-+ suite: "mos10.0-holdback"
-+ section: "main restricted"
-+ priority: 1100
-+ - type: "deb"
-+ name: "Auxiliary"
-+ uri: "http://{settings.MASTER_IP}:8080/{cluster.release.version}/ubuntu/auxiliary"
-+ suite: "auxiliary"
-+ section: "main restricted"
-+ priority: 1150
-+ provision:
-+ metadata:
-+ label: "Provision"
-+ weight: 80
-+ group: "general"
-+ restrictions:
-+ - condition: "false"
-+ action: "hide"
-+ packages:
-+ label: "Initial packages"
-+ weight: 10
-+ type: "textarea"
-+ value: |
-+ acl
-+ anacron
-+ bash-completion
-+ bridge-utils
-+ bsdmainutils
-+ build-essential
-+ cloud-init
-+ curl
-+ daemonize
-+ debconf-utils
-+ gdisk
-+ grub-efi-arm64
-+ hwloc
-+ linux-firmware
-+ linux-headers-generic-lts-xenial
-+ linux-image-generic-lts-xenial
-+ lvm2
-+ mcollective
-+ mdadm
-+ multipath-tools
-+ multipath-tools-boot
-+ nailgun-agent
-+ nailgun-mcagents
-+ network-checker
-+ ntp
-+ ntpdate
-+ openssh-client
-+ openssh-server
-+ puppet
-+ python-amqp
-+ ruby-augeas
-+ ruby-ipaddress
-+ ruby-json
-+ ruby-netaddr
-+ ruby-openstack
-+ ruby-shadow
-+ ruby-stomp
-+ telnet
-+ ubuntu-minimal
-+ ubuntu-standard
-+ uuid-runtime
-+ vim
-+ virt-what
-+ vlan
-+ generated:
-+ cobbler:
-+ profile:
-+ generator_arg: "ubuntu_bootstrap"
-+ provision:
-+ codename: "xenial"
-+ image_data:
-+ /:
-+ uri: "http://{settings.MASTER_IP}:8080/targetimages/env_{cluster.id}_ubuntu_1604_arm64.img.gz"
-+ format: "ext4"
-+ container: "gzip"
-+ /boot:
-+ uri: "http://{settings.MASTER_IP}:8080/targetimages/env_{cluster.id}_ubuntu_1604_arm64-boot.img.gz"
-+ format: "ext2"
-+ container: "gzip"
-+ node_attributes:
-+ cpu_pinning:
-+ metadata:
-+ group: "nfv"
-+ label: "CPU pinning"
-+ weight: 10
-+ restrictions:
-+ - condition: "settings:common.libvirt_type.value != 'kvm'"
-+ action: "hide"
-+ nova:
-+ weight: 10
-+ description: "Number of CPUs for Nova usage"
-+ label: "Nova CPU pinning"
-+ type: "number"
-+ value: 0
-+ min: 0
-+ dpdk:
-+ weight: 20
-+ description: "Number of CPUs for DPDK usage"
-+ label: "DPDK CPU pinning"
-+ type: "number"
-+ value: 0
-+ min: 0
-+ restrictions:
-+ - condition: "not ('experimental' in version:feature_groups)"
-+ action: "hide"
-+ hugepages:
-+ metadata:
-+ group: "nfv"
-+ label: "Huge Pages"
-+ weight: 20
-+ restrictions:
-+ - condition: "settings:common.libvirt_type.value != 'kvm'"
-+ action: "hide"
-+ nova:
-+ weight: 10
-+ description: "Nova Huge Pages configuration"
-+ label: "Nova Huge Pages"
-+ type: "custom_hugepages"
-+ value: {}
-+ dpdk:
-+ weight: 20
-+ description: "DPDK Huge Pages per NUMA node in MB"
-+ label: "DPDK Huge Pages"
-+ type: "number"
-+ value: 0
-+ min: 0
-+ restrictions:
-+ - condition: "not ('experimental' in version:feature_groups)"
-+ action: "hide"
-+ networks_metadata:
-+ dpdk_drivers:
-+ # Sources:
-+ # http://dpdk.org/browse/dpdk/tree/doc/guides/rel_notes/known_issues.rst?h=releases&id=7173acefc7cfdfbbb9b91fcba1c9a67adb4c07c9#n168
-+ # http://dpdk.org/browse/dpdk/tree/lib/librte_eal/common/include/rte_pci_dev_ids.h?h=releases&id=7173acefc7cfdfbbb9b91fcba1c9a67adb4c07c9
-+ igb_uio: [
-+ "8086:100e", "8086:100f", "8086:1011", "8086:1010", "8086:1012",
-+ "8086:101d", "8086:105e", "8086:105f", "8086:1060", "8086:10d9",
-+ "8086:10da", "8086:10a4", "8086:10d5", "8086:10a5", "8086:10bc",
-+ "8086:107d", "8086:107e", "8086:107f", "8086:10b9", "8086:109a",
-+ "8086:10d3", "8086:10f6", "8086:150c", "8086:10c9", "8086:10e6",
-+ "8086:10e7", "8086:10e8", "8086:1526", "8086:150a", "8086:1518",
-+ "8086:150d", "8086:10a7", "8086:10a9", "8086:10d6", "8086:150e",
-+ "8086:150f", "8086:1510", "8086:1511", "8086:1516", "8086:1527",
-+ "8086:1521", "8086:1522", "8086:1523", "8086:1524", "8086:1546",
-+ "8086:1533", "8086:1534", "8086:1535", "8086:1536", "8086:1537",
-+ "8086:1538", "8086:1539", "8086:1f40", "8086:1f41", "8086:1f45",
-+ "8086:0438", "8086:043a", "8086:043c", "8086:0440", "8086:10b6",
-+ "8086:1508", "8086:10c6", "8086:10c8", "8086:150b", "8086:10db",
-+ "8086:10dd", "8086:10ec", "8086:10f1", "8086:10f4", "8086:10f7",
-+ "8086:1514", "8086:1517", "8086:10f9", "8086:10fb", "8086:11a9",
-+ "8086:1f72", "8086:17d0", "8086:0470", "8086:152a", "8086:1529",
-+ "8086:1507", "8086:154d", "8086:154a", "8086:1558", "8086:1557",
-+ "8086:10fc", "8086:151c", "8086:154f", "8086:1528", "8086:1560",
-+ "8086:15ae", "8086:1563", "8086:15aa", "8086:15ab", "8086:155d",
-+ "8086:1572", "8086:1574", "8086:157f", "8086:1580", "8086:1581",
-+ "8086:1583", "8086:1584", "8086:1585", "8086:1586", "8086:15a4",
-+ "8086:10ca", "8086:152d", "8086:1520", "8086:152f", "8086:10ed",
-+ "8086:152e", "8086:1515", "8086:1530", "8086:1564", "8086:1565",
-+ "8086:15a8", "8086:15a9", "8086:154c", "8086:1571", "1af4:1000",
-+ "15ad:07b0", "8086:15a5", "1137:0043", "1137:0071", "14e4:168a",
-+ "14e4:16a9", "14e4:164f", "14e4:168e", "14e4:16af", "14e4:163d",
-+ "14e4:163f", "14e4:168d", "14e4:16a1", "14e4:16a2", "14e4:16ad",
-+ "14e4:16ae", "14e4:163e", "14e4:16a4"
-+ ]
-+- pk: 5
-+ extend: *ubuntu_aarch64_xenial
-+ fields:
-+ name: "Newton on Ubuntu+UCA 16.04 (aarch64)"
-+ version: "newton-10.0"
-+ description: "This option will install the OpenStack Newton packages using Ubuntu as a base operating system, including Ubuntu Cloud Archive OpenStack packages. With high availability features built in, you are getting a robust, enterprise-grade OpenStack deployment."
-+ attributes_metadata:
-+ editable:
-+ repo_setup:
-+ repos:
-+ type: "custom_repo_configuration"
-+ extra_priority: null
-+ description: |
-+ Please note: the first repository will be considered the operating system mirror that will be used during node provisioning.
-+ To create a local repository mirror on the Fuel master node, please follow the instructions provided by running "fuel-createmirror --help" on the Fuel master node.
-+ Please make sure your Fuel master node has Internet access to the repository before attempting to create a mirror.
-+ value:
-+ - type: "deb"
-+ name: "ubuntu-local"
-+ uri: "http://{settings.MASTER_IP}:8080/mirrors/ubuntu"
-+ suite: "xenial"
-+ section: "main"
-+ priority: null
-+ - type: "deb"
-+ name: "ubuntu"
-+ uri: "http://ports.ubuntu.com/"
-+ suite: "xenial"
-+ section: "main universe multiverse"
-+ priority: null
-+ - type: "deb"
-+ name: "ubuntu-updates"
-+ uri: "http://ports.ubuntu.com/"
-+ suite: "xenial-updates"
-+ section: "main universe multiverse"
-+ priority: null
-+ - type: "deb"
-+ name: "ubuntu-security"
-+ uri: "http://ports.ubuntu.com/"
-+ suite: "xenial-security"
-+ section: "main universe multiverse"
-+ priority: null
-+ - type: "deb"
-+ name: "uca"
-+ uri: "http://ubuntu-cloud.archive.canonical.com/ubuntu"
-+ suite: "xenial-updates/newton"
-+ section: "main"
-+ priority: 1080
-+ - type: "deb"
-+ name: "uca-proposed"
-+ uri: "http://ubuntu-cloud.archive.canonical.com/ubuntu"
-+ suite: "xenial-proposed/newton"
-+ section: "main"
-+ priority: 1080
-+ - type: "deb"
-+ name: "mos"
-+ uri: "http://{settings.MASTER_IP}:8080/{cluster.release.version}/ubuntu/x86_64"
-+ suite: "mos10.0"
-+ section: "main restricted"
-+ priority: 1050
-+ - type: "deb"
-+ name: "mos-updates"
-+ uri: "http://linux.enea.com/mos-repos/ubuntu/{cluster.release.environment_version}"
-+ suite: "mos10.0-updates"
-+ section: "main restricted"
-+ priority: 1050
-+ - type: "deb"
-+ name: "mos-security"
-+ uri: "http://linux.enea.com/mos-repos/ubuntu/{cluster.release.environment_version}"
-+ suite: "mos10.0-security"
-+ section: "main restricted"
-+ priority: 1050
-+ - type: "deb"
-+ name: "mos-holdback"
-+ uri: "http://linux.enea.com/mos-repos/ubuntu/{cluster.release.environment_version}"
-+ suite: "mos10.0-holdback"
-+ section: "main restricted"
-+ priority: 1100
-+ - type: "deb"
-+ name: "Auxiliary"
-+ uri: "http://{settings.MASTER_IP}:8080/{cluster.release.version}/ubuntu/auxiliary"
-+ suite: "auxiliary"
-+ section: "main restricted"
-+ priority: 1150
-+ repo_type:
-+ type: "hidden"
-+ weight: 58
-+ value: "uca"
-+ pin_haproxy:
-+ label: "HAProxy APT Pinning"
-+ description: "Use Fuel HAProxy packages instead of upstream"
-+ weight: 59
-+ type: "checkbox"
-+ value: true
-+ pin_rabbitmq:
-+ label: "RabbitMQ APT Pinning"
-+ description: "Use Fuel RabbitMQ packages instead of upstream"
-+ weight: 60
-+ type: "checkbox"
-+ value: true
-+ pin_ceph:
-+ label: "Ceph APT Pinning"
-+ description: "Use Fuel Ceph packages instead of upstream"
-+ weight: 61
-+ type: "checkbox"
-+ value: true
diff --git a/patches/fuel-web/0002-Add-arch-to-nailgun-release-and-target-image.patch b/patches/fuel-web/0002-Add-arch-to-nailgun-release-and-target-image.patch
deleted file mode 100644
index df3f96ca..00000000
--- a/patches/fuel-web/0002-Add-arch-to-nailgun-release-and-target-image.patch
+++ /dev/null
@@ -1,330 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2017 Enea AB, Cavium and others.
-:
-: All rights reserved. This program and the accompanying materials
-: are made available under the terms of the Apache License, Version 2.0
-: which accompanies this distribution, and is available at
-: http://www.apache.org/licenses/LICENSE-2.0
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Stanislaw Kardach <stanislaw.kardach@cavium.com>
-Date: Sun, 18 Dec 2016 21:28:21 +0100
-Subject: [PATCH] Add arch to nailgun release and target image
-
-This is required so that the TestVM image is created using a cirros
-image that is compatible with the architecture of the deployment setup.
-As a bonus, it is also used when building the target image.
-
-[ Alexandru Avadanii ]
-Rebased onto Newton.
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Signed-off-by: Stanislaw Kardach <stanislaw.kardach@cavium.com>
----
- nailgun/nailgun/consts.py | 5 ++
- .../alembic_migrations/versions/armband.py | 53 ++++++++++++++++++++++
- nailgun/nailgun/db/sqlalchemy/models/release.py | 8 ++++
- nailgun/nailgun/fixtures/openstack.yaml | 5 ++
- .../nailgun/orchestrator/deployment_serializers.py | 8 +++-
- .../orchestrator/provisioning_serializers.py | 3 +-
- nailgun/nailgun/orchestrator/tasks_templates.py | 5 +-
- .../integration/test_cluster_changes_handler.py | 12 ++---
- .../integration/test_orchestrator_serializer.py | 4 +-
- nailgun/nailgun/test/unit/test_tasks_templates.py | 6 ++-
- 10 files changed, 95 insertions(+), 14 deletions(-)
- create mode 100644 nailgun/nailgun/db/migration/alembic_migrations/versions/armband.py
-
-diff --git a/nailgun/nailgun/consts.py b/nailgun/nailgun/consts.py
-index ccbe860..a3875ce 100644
---- a/nailgun/nailgun/consts.py
-+++ b/nailgun/nailgun/consts.py
-@@ -38,6 +38,11 @@ RELEASE_OS = Enum(
- )
- )
-
-+RELEASE_ARCHS = Enum(
-+ 'amd64',
-+ 'arm64'
-+)
-+
- CLUSTER_MODES = Enum(
- 'multinode',
- 'ha_full',
-diff --git a/nailgun/nailgun/db/migration/alembic_migrations/versions/armband.py b/nailgun/nailgun/db/migration/alembic_migrations/versions/armband.py
-new file mode 100644
-index 0000000..6e42b3f
---- /dev/null
-+++ b/nailgun/nailgun/db/migration/alembic_migrations/versions/armband.py
-@@ -0,0 +1,53 @@
-+# Copyright 2016 Cavium, Inc.
-+#
-+# Licensed under the Apache License, Version 2.0 (the "License"); you may
-+# not use this file except in compliance with the License. You may obtain
-+# a copy of the License at
-+#
-+# http://www.apache.org/licenses/LICENSE-2.0
-+#
-+# Unless required by applicable law or agreed to in writing, software
-+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-+# License for the specific language governing permissions and limitations
-+# under the License.
-+
-+"""Armband patches
-+
-+Revision ID: f9b7fd91ac19
-+Revises: c6edea552f1e
-+Create Date: 2016-03-01 23:18:58.712617
-+
-+"""
-+
-+# revision identifiers, used by Alembic.
-+revision = 'f9b7fd91ac19'
-+down_revision = 'c6edea552f1e'
-+
-+from alembic import op
-+from nailgun.utils.migration import drop_enum
-+import sqlalchemy as sa
-+
-+ENUMS = (
-+ 'release_arch',
-+)
-+
-+
-+def upgrade():
-+ add_release_arch()
-+
-+
-+def downgrade():
-+ remove_release_arch()
-+ map(drop_enum, ENUMS)
-+
-+
-+def add_release_arch():
-+ arch_enum = sa.Enum('amd64', 'arm64', name='release_arch')
-+ arch_enum.create(op.get_bind(), checkfirst=False)
-+ op.add_column('releases', sa.Column('arch', arch_enum, nullable=False,
-+ server_default='amd64'))
-+
-+
-+def remove_release_arch():
-+ op.drop_column('releases', 'arch')
-diff --git a/nailgun/nailgun/db/sqlalchemy/models/release.py b/nailgun/nailgun/db/sqlalchemy/models/release.py
-index a069b61..882d32c 100644
---- a/nailgun/nailgun/db/sqlalchemy/models/release.py
-+++ b/nailgun/nailgun/db/sqlalchemy/models/release.py
-@@ -40,6 +40,14 @@ class Release(Base):
- id = Column(Integer, primary_key=True)
- name = Column(Unicode(100), nullable=False)
- version = Column(String(30), nullable=False)
-+ arch = Column(
-+ Enum(
-+ *consts.RELEASE_ARCHS,
-+ name='release_arch'
-+ ),
-+ nullable=False,
-+ default=consts.RELEASE_ARCHS.amd64
-+ )
- description = Column(Unicode)
- operating_system = Column(String(50), nullable=False)
- state = Column(
-diff --git a/nailgun/nailgun/fixtures/openstack.yaml b/nailgun/nailgun/fixtures/openstack.yaml
-index ba967d7..c1d2a71 100644
---- a/nailgun/nailgun/fixtures/openstack.yaml
-+++ b/nailgun/nailgun/fixtures/openstack.yaml
-@@ -2113,6 +2113,7 @@
- name: "Newton on CentOS 6.5"
- state: "unavailable"
- version: "newton-10.0"
-+ arch: "amd64"
- operating_system: "CentOS"
- description: "This option will install the OpenStack Mitaka packages using a CentOS based operating system. With high availability features built in, you are getting a robust, enterprise-grade OpenStack deployment."
- attributes_metadata:
-@@ -2186,6 +2187,7 @@
- fields:
- name: "Newton on Ubuntu 16.04"
- version: "newton-10.0"
-+ arch: "amd64"
- operating_system: "Ubuntu"
- description: "This option will install the OpenStack Newton packages using Ubuntu as a base operating system. With high availability features built in, you are getting a robust, enterprise-grade OpenStack deployment."
- attributes_metadata:
-@@ -2417,6 +2419,7 @@
- fields:
- name: "Newton on Ubuntu+UCA 16.04"
- version: "newton-10.0"
-+ arch: "amd64"
- description: "This option will install the OpenStack Newton packages using Ubuntu as a base operating system, including Ubuntu Cloud Archive OpenStack packages. With high availability features built in, you are getting a robust, enterprise-grade OpenStack deployment."
- attributes_metadata:
- editable:
-@@ -2517,6 +2520,7 @@
- fields:
- name: "Newton on Ubuntu 16.04 (aarch64)"
- version: "newton-10.0"
-+ arch: "arm64"
- operating_system: "Ubuntu"
- description: "This option will install the OpenStack Newton packages using Ubuntu as a base operating system. With high availability features built in, you are getting a robust, enterprise-grade OpenStack deployment."
- attributes_metadata:
-@@ -2754,6 +2758,7 @@
- fields:
- name: "Newton on Ubuntu+UCA 16.04 (aarch64)"
- version: "newton-10.0"
-+ arch: "arm64"
- description: "This option will install the OpenStack Newton packages using Ubuntu as a base operating system, including Ubuntu Cloud Archive OpenStack packages. With high availability features built in, you are getting a robust, enterprise-grade OpenStack deployment."
- attributes_metadata:
- editable:
-diff --git a/nailgun/nailgun/orchestrator/deployment_serializers.py b/nailgun/nailgun/orchestrator/deployment_serializers.py
-index f983ae3..2f9cec2 100644
---- a/nailgun/nailgun/orchestrator/deployment_serializers.py
-+++ b/nailgun/nailgun/orchestrator/deployment_serializers.py
-@@ -261,7 +261,13 @@ class DeploymentMultinodeSerializer(object):
- img_dir = '/usr/share/cirros-testvm/'
- else:
- img_dir = '/opt/vm/'
-- image_data['img_path'] = '{0}cirros-x86_64-disk.img'.format(img_dir)
-+ arch = node.cluster.release.arch
-+ if arch == "amd64":
-+ arch = "x86_64"
-+ elif arch == "arm64":
-+ arch = "aarch64"
-+ image_data['img_path'] = '{0}cirros-{1}-disk.img'.format(img_dir,
-+ arch)
-
- properties_data = {}
-
-diff --git a/nailgun/nailgun/orchestrator/provisioning_serializers.py b/nailgun/nailgun/orchestrator/provisioning_serializers.py
-index 7b2c6ac..f2c05e1 100644
---- a/nailgun/nailgun/orchestrator/provisioning_serializers.py
-+++ b/nailgun/nailgun/orchestrator/provisioning_serializers.py
-@@ -329,7 +329,8 @@ class ProvisioningSerializer61(ProvisioningSerializer):
- attrs['repo_setup']['repos'],
- attrs['provision'],
- cluster.id,
-- packages))
-+ packages,
-+ cluster.release.arch))
-
- PriorityStrategy().one_by_one(tasks)
- return tasks
-diff --git a/nailgun/nailgun/orchestrator/tasks_templates.py b/nailgun/nailgun/orchestrator/tasks_templates.py
-index 8252891..84bebe6 100644
---- a/nailgun/nailgun/orchestrator/tasks_templates.py
-+++ b/nailgun/nailgun/orchestrator/tasks_templates.py
-@@ -208,7 +208,7 @@ def make_reboot_task(uids, task):
-
-
- def make_provisioning_images_task(
-- uids, repos, provision_data, cid, packages):
-+ uids, repos, provision_data, cid, packages, arch):
- conf = {
- 'repos': repos,
- 'image_data': provision_data['image_data'],
-@@ -230,7 +230,8 @@ def make_provisioning_images_task(
- "--image_build_dir /var/lib/fuel/ibp "
- "--log-file /var/log/fuel-agent-env-{0}.log "
- "--data_driver nailgun_build_image "
-- "--input_data '{1}'").format(cid, conf),
-+ "--target_arch {1} "
-+ "--input_data '{2}'").format(cid, arch, conf),
- 'timeout': settings.PROVISIONING_IMAGES_BUILD_TIMEOUT,
- 'retries': 1}})
-
-diff --git a/nailgun/nailgun/test/integration/test_cluster_changes_handler.py b/nailgun/nailgun/test/integration/test_cluster_changes_handler.py
-index d7e964e..bce8289 100644
---- a/nailgun/nailgun/test/integration/test_cluster_changes_handler.py
-+++ b/nailgun/nailgun/test/integration/test_cluster_changes_handler.py
-@@ -148,7 +148,7 @@ class TestHandlers(BaseIntegrationTest):
- common_attrs['last_controller'] = controller_nodes[-1]['name']
- common_attrs['storage']['pg_num'] = 128
-
-- common_attrs['test_vm_image'] = {
-+ common_attrs['test_vm_image'] = [{
- 'container_format': 'bare',
- 'public': 'true',
- 'disk_format': 'qcow2',
-@@ -164,7 +164,7 @@ class TestHandlers(BaseIntegrationTest):
- 'murano_image_info': """'{"title": "Murano Demo", "type":"""
- """ "cirros.demo"}'""",
- },
-- }
-+ }]
-
- critical_mapping = {
- 'primary-controller': True,
-@@ -565,7 +565,7 @@ class TestHandlers(BaseIntegrationTest):
- common_attrs['last_controller'] = controller_nodes[-1]['name']
- common_attrs['storage']['pg_num'] = 128
-
-- common_attrs['test_vm_image'] = {
-+ common_attrs['test_vm_image'] = [{
- 'container_format': 'bare',
- 'public': 'true',
- 'disk_format': 'qcow2',
-@@ -581,7 +581,7 @@ class TestHandlers(BaseIntegrationTest):
- 'murano_image_info': """'{"title": "Murano Demo", "type":"""
- """ "cirros.demo"}'""",
- },
-- }
-+ }]
-
- critical_mapping = {
- 'primary-controller': True,
-@@ -1053,7 +1053,7 @@ class TestHandlers(BaseIntegrationTest):
- common_attrs['last_controller'] = controller_nodes[-1]['name']
- common_attrs['storage']['pg_num'] = 128
-
-- common_attrs['test_vm_image'] = {
-+ common_attrs['test_vm_image'] = [{
- 'container_format': 'bare',
- 'public': 'true',
- 'disk_format': 'qcow2',
-@@ -1069,7 +1069,7 @@ class TestHandlers(BaseIntegrationTest):
- 'murano_image_info': """'{"title": "Murano Demo", "type":"""
- """ "cirros.demo"}'""",
- },
-- }
-+ }]
-
- critical_mapping = {
- 'primary-controller': True,
-diff --git a/nailgun/nailgun/test/integration/test_orchestrator_serializer.py b/nailgun/nailgun/test/integration/test_orchestrator_serializer.py
-index f399602..6034f30 100644
---- a/nailgun/nailgun/test/integration/test_orchestrator_serializer.py
-+++ b/nailgun/nailgun/test/integration/test_orchestrator_serializer.py
-@@ -2565,12 +2565,12 @@ class BaseDeploymentSerializer(BaseSerializerTest):
-
- def check_no_murano_data(self):
- glance_properties = self.serializer.generate_test_vm_image_data(
-- self.env.nodes[0])['test_vm_image']['glance_properties']
-+ self.env.nodes[0])['test_vm_image'][0]['glance_properties']
- self.assertNotIn('murano_image_info', glance_properties)
-
- def check_murano_data(self):
- glance_properties = self.serializer.generate_test_vm_image_data(
-- self.env.nodes[0])['test_vm_image']['glance_properties']
-+ self.env.nodes[0])['test_vm_image'][0]['glance_properties']
- self.assertIn('murano_image_info', glance_properties)
-
- @staticmethod
-diff --git a/nailgun/nailgun/test/unit/test_tasks_templates.py b/nailgun/nailgun/test/unit/test_tasks_templates.py
-index 4db183f..4f5d2cb 100644
---- a/nailgun/nailgun/test/unit/test_tasks_templates.py
-+++ b/nailgun/nailgun/test/unit/test_tasks_templates.py
-@@ -140,7 +140,8 @@ class TestMakeTask(base.BaseTestCase):
- }
- }},
- cid=123,
-- packages=packages
-+ packages=packages,
-+ arch='amd64'
- )
-
- fuel_image_conf = {
-@@ -177,7 +178,8 @@ class TestMakeTask(base.BaseTestCase):
- cmd = result["parameters"]["cmd"].lstrip(
- "fa_build_image --image_build_dir /var/lib/fuel/ibp "
- "--log-file /var/log/fuel-agent-env-123.log "
-- "--data_driver nailgun_build_image --input_data '").rstrip("'")
-+ "--data_driver nailgun_build_image --target_arch amd64"
-+ " --input_data '").rstrip("'")
- self.assertEqual(jsonutils.loads(cmd), fuel_image_conf)
-
- def test_generate_ironic_bootstrap_keys_task(self):
diff --git a/patches/fuel-web/0003-AArch64-Cirros-TestVM-Use-AAVMF-guest-UEFI.patch b/patches/fuel-web/0003-AArch64-Cirros-TestVM-Use-AAVMF-guest-UEFI.patch
deleted file mode 100644
index 64e60b31..00000000
--- a/patches/fuel-web/0003-AArch64-Cirros-TestVM-Use-AAVMF-guest-UEFI.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2017 Enea AB, Cavium and others.
-:
-: All rights reserved. This program and the accompanying materials
-: are made available under the terms of the Apache License, Version 2.0
-: which accompanies this distribution, and is available at
-: http://www.apache.org/licenses/LICENSE-2.0
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Sat, 21 Jan 2017 00:01:16 +0100
-Subject: [PATCH] AArch64: Cirros TestVM: Use AAVMF (guest UEFI)
-
-Based on the direct kernel boot patch by Stan.
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Signed-off-by: Stanislaw Kardach <stanislaw.kardach@cavium.com>
----
- nailgun/nailgun/orchestrator/deployment_serializers.py | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/nailgun/nailgun/orchestrator/deployment_serializers.py b/nailgun/nailgun/orchestrator/deployment_serializers.py
-index 77fcba1..fd33b3f 100644
---- a/nailgun/nailgun/orchestrator/deployment_serializers.py
-+++ b/nailgun/nailgun/orchestrator/deployment_serializers.py
-@@ -284,4 +284,11 @@ class DeploymentMultinodeSerializer(object):
-
-+ # AArch64: Use AAVMF (guest UEFI)
-+ if arch == 'aarch64':
-+ properties_data = {
-+ 'hw_firmware_type': 'uefi',
-+ 'short_id': 'ubuntu16.04'
-+ }
-+
- # NOTE(aschultz): properties was added as part of N and should be
- # used infavor of glance_properties
- image_data['glance_properties'] = self.generate_properties_arguments(
diff --git a/patches/fuel-web/0004-nailgun-Openstack-release-Pin-kernel-to-4.8.0-9944.patch b/patches/fuel-web/0004-nailgun-Openstack-release-Pin-kernel-to-4.8.0-9944.patch
deleted file mode 100644
index a617c809..00000000
--- a/patches/fuel-web/0004-nailgun-Openstack-release-Pin-kernel-to-4.8.0-9944.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2017 Enea AB and others.
-:
-: All rights reserved. This program and the accompanying materials
-: are made available under the terms of the Apache License, Version 2.0
-: which accompanies this distribution, and is available at
-: http://www.apache.org/licenses/LICENSE-2.0
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Thu, 23 Mar 2017 01:40:45 +0100
-Subject: [PATCH] nailgun: Openstack release: Pin kernel to 4.8.0-9944
-
-Since newer kernels have issues with AAVMF + vhost_net,
-we need to also temporarily blacklist vhost_net.
-
-NOTE: This change also adds linux-image-extra packages to both x86_64
- and AArch64 target image(s).
-
-TODO: Remove vhost_net blacklist (later).
-
-JIRA: https://jira.opnfv.org/browse/ARMBAND-161
-JIRA: https://jira.opnfv.org/browse/ARMBAND-171
-JIRA: https://jira.opnfv.org/browse/ARMBAND-227
-JIRA: https://jira.opnfv.org/browse/ARMBAND-230
-JIRA: https://jira.opnfv.org/browse/ARMBAND-239
-JIRA: https://jira.opnfv.org/browse/ARMBAND-244
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- nailgun/nailgun/fixtures/openstack.yaml | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/nailgun/nailgun/fixtures/openstack.yaml b/nailgun/nailgun/fixtures/openstack.yaml
-index 5712006..d404168 100644
---- a/nailgun/nailgun/fixtures/openstack.yaml
-+++ b/nailgun/nailgun/fixtures/openstack.yaml
-@@ -2164,8 +2164,9 @@
- grub-pc
- hwloc
- linux-firmware
-- linux-headers-generic-lts-xenial
-- linux-image-generic-lts-xenial
-+ linux-headers-4.8.0-9944-generic
-+ linux-image-4.8.0-9944-generic
-+ linux-image-extra-4.8.0-9944-generic
- lvm2
- mcollective
- mdadm
-@@ -2492,6 +2493,7 @@
- value: |
- acl
- anacron
-+ armband-vhost-net-blacklist
- bash-completion
- bridge-utils
- bsdmainutils
-@@ -2504,8 +2506,9 @@
- grub-efi-arm64
- hwloc
- linux-firmware
-- linux-headers-generic-lts-xenial
-- linux-image-generic-lts-xenial
-+ linux-headers-4.8.0-9944-generic
-+ linux-image-4.8.0-9944-generic
-+ linux-image-extra-4.8.0-9944-generic
- lvm2
- mcollective
- mdadm
diff --git a/patches/fuel-web/0005-Update-Host-OS-NTP-Servers-to-pool.ntp.org.patch b/patches/fuel-web/0005-Update-Host-OS-NTP-Servers-to-pool.ntp.org.patch
deleted file mode 100644
index a8a57a42..00000000
--- a/patches/fuel-web/0005-Update-Host-OS-NTP-Servers-to-pool.ntp.org.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2017 Enea AB and others.
-:
-: All rights reserved. This program and the accompanying materials
-: are made available under the terms of the Apache License, Version 2.0
-: which accompanies this distribution, and is available at
-: http://www.apache.org/licenses/LICENSE-2.0
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Catalina Focsa <catalina.focsa@enea.com>
-Date: Mon, 3 Apr 2017 11:30:10 +0200
-Subject: [PATCH] Update Host OS NTP Servers to pool.ntp.org
-
-Old *.fuel.pool.ntp.org values are no longer accessible
-LP: https://bugs.launchpad.net/fuel/+bug/1679636
-JIRA: https://jira.opnfv.org/browse/ARMBAND-225
-
-Signed-off-by: Catalina Focsa <catalina.focsa@enea.com>
----
- nailgun/nailgun/settings.yaml | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/nailgun/nailgun/settings.yaml b/nailgun/nailgun/settings.yaml
-index 92b3518..1041c66 100644
---- a/nailgun/nailgun/settings.yaml
-+++ b/nailgun/nailgun/settings.yaml
-@@ -1100,8 +1100,8 @@ DNS_UPSTREAM:
- - '8.8.8.8'
- - '8.8.4.4'
- NTP_UPSTREAM:
-- - '0.fuel.pool.ntp.org'
-- - '1.fuel.pool.ntp.org'
-+ - '0.pool.ntp.org'
-+ - '1.pool.ntp.org'
-
- # deadlocks detection settings
- LOG_DEADLOCKS_WARNINGS: 1
diff --git a/patches/fuel-web/0006-nailgun-Add-NIC-vendorid-and-device-id-for-Cavium-NI.patch b/patches/fuel-web/0006-nailgun-Add-NIC-vendorid-and-device-id-for-Cavium-NI.patch
deleted file mode 100644
index 196cea52..00000000
--- a/patches/fuel-web/0006-nailgun-Add-NIC-vendorid-and-device-id-for-Cavium-NI.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2017 Enea AB and others.
-:
-: All rights reserved. This program and the accompanying materials
-: are made available under the terms of the Apache License, Version 2.0
-: which accompanies this distribution, and is available at
-: http://www.apache.org/licenses/LICENSE-2.0
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Andrei Varvara <andrei.varvara@enea.com>
-Date: Thu, 4 May 2017 13:35:32 +0200
-Subject: [PATCH] nailgun: Add NIC vendorid and device id for Cavium NIC
-
-In order to enable DPDK and ovs-dpdk in Fuel, a checkbox must be enabled
-in the interface configuration menu of the nodes.
-
-This did not work on ThunderX based PODs, because Fuel filters out NICs based
-on Vendor Id (currently Intel only) and Product Id. This is implemented
-via a static list of known Vid and Pid pairs in openstack.yaml file.
-
-Added Cavium NIC to the list of DPDK supported NICs so that fuel will
-enable the DPDK checkbox.
-
-Signed-off-by: Andrei Varvara <andrei.varvara@enea.com>
----
- nailgun/nailgun/fixtures/openstack.yaml | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/nailgun/nailgun/fixtures/openstack.yaml b/nailgun/nailgun/fixtures/openstack.yaml
-index 0b27611..070004e 100644
---- a/nailgun/nailgun/fixtures/openstack.yaml
-+++ b/nailgun/nailgun/fixtures/openstack.yaml
-@@ -2293,7 +2293,7 @@
- "15ad:07b0", "8086:15a5", "1137:0043", "1137:0071", "14e4:168a",
- "14e4:16a9", "14e4:164f", "14e4:168e", "14e4:16af", "14e4:163d",
- "14e4:163f", "14e4:168d", "14e4:16a1", "14e4:16a2", "14e4:16ad",
-- "14e4:16ae", "14e4:163e", "14e4:16a4", "8086:10f8"
-+ "14e4:16ae", "14e4:163e", "14e4:16a4", "8086:10f8", "177d:a034"
- ]
- - pk: 3
- extend: *ubuntu_xenial
-@@ -2635,7 +2635,7 @@
- "15ad:07b0", "8086:15a5", "1137:0043", "1137:0071", "14e4:168a",
- "14e4:16a9", "14e4:164f", "14e4:168e", "14e4:16af", "14e4:163d",
- "14e4:163f", "14e4:168d", "14e4:16a1", "14e4:16a2", "14e4:16ad",
-- "14e4:16ae", "14e4:163e", "14e4:16a4"
-+ "14e4:16ae", "14e4:163e", "14e4:16a4", "177d:a034"
- ]
- - pk: 5
- extend: *ubuntu_aarch64_xenial
-
diff --git a/patches/fuel-web/cross-bootstrap/0000-Add-arch-to-nailgun-release-and-target-image.patch b/patches/fuel-web/cross-bootstrap/0000-Add-arch-to-nailgun-release-and-target-image.patch
deleted file mode 120000
index 64ff45c3..00000000
--- a/patches/fuel-web/cross-bootstrap/0000-Add-arch-to-nailgun-release-and-target-image.patch
+++ /dev/null
@@ -1 +0,0 @@
-../0002-Add-arch-to-nailgun-release-and-target-image.patch \ No newline at end of file
diff --git a/patches/fuel-web/multiarch-fuel/0000-Add-arch-to-nailgun-release-and-target-image.patch b/patches/fuel-web/multiarch-fuel/0000-Add-arch-to-nailgun-release-and-target-image.patch
deleted file mode 120000
index 64ff45c3..00000000
--- a/patches/fuel-web/multiarch-fuel/0000-Add-arch-to-nailgun-release-and-target-image.patch
+++ /dev/null
@@ -1 +0,0 @@
-../0002-Add-arch-to-nailgun-release-and-target-image.patch \ No newline at end of file
diff --git a/patches/fuel-web/multiarch-fuel/0000-nailgun-Add-AArch64-Openstack-Newton-release-s.patch b/patches/fuel-web/multiarch-fuel/0000-nailgun-Add-AArch64-Openstack-Newton-release-s.patch
deleted file mode 120000
index 2e9288ee..00000000
--- a/patches/fuel-web/multiarch-fuel/0000-nailgun-Add-AArch64-Openstack-Newton-release-s.patch
+++ /dev/null
@@ -1 +0,0 @@
-../0001-nailgun-Add-AArch64-Openstack-Newton-release-s.patch \ No newline at end of file
diff --git a/patches/fuel-web/multiarch-fuel/0001-FIXME-Disable-amd64-Newton-on-Ubuntu-for-now.patch b/patches/fuel-web/multiarch-fuel/0001-FIXME-Disable-amd64-Newton-on-Ubuntu-for-now.patch
deleted file mode 100644
index abfb9529..00000000
--- a/patches/fuel-web/multiarch-fuel/0001-FIXME-Disable-amd64-Newton-on-Ubuntu-for-now.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2017 Enea AB and others.
-:
-: All rights reserved. This program and the accompanying materials
-: are made available under the terms of the Apache License, Version 2.0
-: which accompanies this distribution, and is available at
-: http://www.apache.org/licenses/LICENSE-2.0
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Sat, 19 Mar 2016 19:02:15 +0100
-Subject: [PATCH] FIXME: Disable amd64 Newton on Ubuntu for now.
-
-Until we fix all cohabitation of amd64 and arm64, disable Openstack
-releases <Newton on Ubuntu 16.04> and <Newton on Ubuntu+UCA 16.04>
-(both x86_64) in openstack.yaml fixture.
-
-TODO: Propose renaming above releases to include arch in name.
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- nailgun/nailgun/fixtures/openstack.yaml | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/nailgun/nailgun/fixtures/openstack.yaml b/nailgun/nailgun/fixtures/openstack.yaml
---- a/nailgun/nailgun/fixtures/openstack.yaml
-+++ b/nailgun/nailgun/fixtures/openstack.yaml
-@@ -1980,6 +1980,7 @@
- extend: *base_release
- fields:
- name: "Newton on Ubuntu 16.04"
-+ state: "unavailable"
- version: "newton-10.0"
- arch: "amd64"
- operating_system: "Ubuntu"
-@@ -2221,5 +2222,6 @@
- fields:
- name: "Newton on Ubuntu+UCA 16.04"
-+ state: "unavailable"
- version: "newton-10.0"
- arch: "amd64"
- description: "This option will install the OpenStack Newton packages using Ubuntu as a base operating system, including Ubuntu Cloud Archive OpenStack packages. With high availability features built in, you are getting a robust, enterprise-grade OpenStack deployment."
diff --git a/patches/fuel-web/mysql-sst-provider/0001-Add-configuration-item-for-WSREP-SST-provider.patch b/patches/fuel-web/mysql-sst-provider/0001-Add-configuration-item-for-WSREP-SST-provider.patch
deleted file mode 100644
index 97d9d967..00000000
--- a/patches/fuel-web/mysql-sst-provider/0001-Add-configuration-item-for-WSREP-SST-provider.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2017 Enea AB, Cavium and others.
-:
-: All rights reserved. This program and the accompanying materials
-: are made available under the terms of the Apache License, Version 2.0
-: which accompanies this distribution, and is available at
-: http://www.apache.org/licenses/LICENSE-2.0
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Stanislaw Kardach <stanislaw.kardach@cavium.com>
-Date: Wed, 20 Apr 2016 15:05:15 -0700
-Subject: [PATCH] Add configuration item for WSREP SST provider
-
-This patch adds a radio button in "OpenStack Services" tab of the
-environment settings to configure which WSREP SST provider to use for
-MySQL.
-
-Signed-off-by: Stanislaw Kardach <stanislaw.kardach@cavium.com>
----
- nailgun/nailgun/fixtures/openstack.yaml | 21 +++++++++++++++++++++
- 1 file changed, 21 insertions(+)
-
-diff --git a/nailgun/nailgun/fixtures/openstack.yaml b/nailgun/nailgun/fixtures/openstack.yaml
-index ba25093..e855cf0 100644
---- a/nailgun/nailgun/fixtures/openstack.yaml
-+++ b/nailgun/nailgun/fixtures/openstack.yaml
-@@ -932,6 +932,27 @@
- description: "Name for Mongo replication set"
- weight: 30
- type: "text"
-+ mysql_wsrep:
-+ metadata:
-+ label: "Database configuration"
-+ weight: 15
-+ group: "openstack_services"
-+ wsrep_method:
-+ value: "xtrabackup-v2"
-+ label: "WSREP SST provider"
-+ description: "This setting changes the wsrep_sst_method switch in the MySQL Galera cluster configuration."
-+ weight: 10
-+ type: "radio"
-+ values:
-+ - data: "xtrabackup-v2"
-+ label: "xtrabackup-v2"
-+ description: "Use Percona xtrabackup v2 provider. This is broken on some ARM64 platforms due to outdated MySQL/InnoDB code used by xtrabackup."
-+ - data: "rsync"
-+ label: "rsync"
-+ description: "Use rsync provider. Use if xtrabackup is broken on your platform."
-+ - data: "mysqldump"
-+ label: "mysqldump"
-+ description: "Use mysqldump provider (untested)."
- additional_components:
- metadata:
- label: "Additional Components"