From 42f8585ebb8fffad19a89314659ab9129176c3e9 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sat, 1 Oct 2016 13:18:11 +0200 Subject: build: Rework patch mechanism for Fuel submodules While refactoring the patching mechanism, take care of: - Sync submodule handling with Fuel@OPFNV; - build: Investigate/prepare for moving patches to Fuel@OPNFV; - build: Investigate divergent fuel-mirror; - ISO build: cacheid for Fuel comps should not depend on Armband git commit; CHANGE: Rename/shuffle patches while grouping them in "features", preparing for upstreaming them to Fuel@OPNFV and beyond. CHANGE: Allow linking patches for better representing the dependency between one patch and different features. e.g. 0001-Add-arch-to-nailgun-release-and-target-image.patch: - part of `multiarch-fuel`, because it extends Fuel; - part of `direct-kernel-boot`, as arch is required for that; - part of `cross-bootstrap`, target image is arch-dependent; NOTE: Patch links are not staged to Fuel@OPNFV, they only serve as markers that a specific patch is part of a feature. CHANGE: Kill all Fuel component submodules, now handled in Fuel@OPNFV: - fuel-agent - fuel-astute - fuel-library - fuel-mirror - fuel-nailgun-agent - fuel-web CHANGE: Move armband-fuel-config.mk to armband git root. FIXME: m1.micro-Increase-profile-RAM-size-to-128MB.patch is NOT part of `cross-bootstrap` feature, but patch context says so ... FIXME: 0001-Add-arm64-deb-repositories-setup.patch is broken at `make patches-export` by removing spaces at EOL. v2 -> v3: * Phony patch support (links to show a patch belongs to a feature); * Updated README.md v3 -> v7: * Re-export Fuel submodules & plugins patches (update patch context); * Update Cavium mail addresses (s/caviumnetworks.com/cavium.com/); * Ignore submodule changes; * Add armband git repo info to gitinfo_fuel.txt at build time; Implements: ARMBAND-136 Closes-bug: ARMBAND-95 Closes-bug: ARMBAND-93 Closes-bug: ARMBAND-92 Change-Id: I1a236d9f43b2e6dca22055911f696b43c22b5973 Signed-off-by: Alexandru Avadanii --- ...configuration-item-for-WSREP-SST-provider.patch | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 patches/fuel-web/mysql-sst-provider/0001-Add-configuration-item-for-WSREP-SST-provider.patch (limited to 'patches/fuel-web/mysql-sst-provider/0001-Add-configuration-item-for-WSREP-SST-provider.patch') 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 new file mode 100644 index 00000000..2f63ec06 --- /dev/null +++ b/patches/fuel-web/mysql-sst-provider/0001-Add-configuration-item-for-WSREP-SST-provider.patch @@ -0,0 +1,45 @@ +From: Stanislaw Kardach +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 +--- + 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" -- cgit 1.2.3-korg