diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-10-01 13:18:11 +0200 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-10-09 16:33:43 +0200 |
commit | 42f8585ebb8fffad19a89314659ab9129176c3e9 (patch) | |
tree | e2cf6a4797bcbd036e080541cc3925f8b209549b /patches/fuel-library/upstream-backports | |
parent | 6f3a054fc95622f0c002f72c0fac6074bb36c36f (diff) |
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 <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/fuel-library/upstream-backports')
3 files changed, 204 insertions, 0 deletions
diff --git a/patches/fuel-library/upstream-backports/0001-Set-net.ipv4.ip_nonlocal_bind-1-for-vrouter-namespac.patch b/patches/fuel-library/upstream-backports/0001-Set-net.ipv4.ip_nonlocal_bind-1-for-vrouter-namespac.patch new file mode 100644 index 00000000..281ef231 --- /dev/null +++ b/patches/fuel-library/upstream-backports/0001-Set-net.ipv4.ip_nonlocal_bind-1-for-vrouter-namespac.patch @@ -0,0 +1,54 @@ +From: Bartosz Kupidura <bkupidura@mirantis.com> +Date: Mon, 27 Jun 2016 13:12:29 +0200 +Subject: [PATCH] Set net.ipv4.ip_nonlocal_bind=1 for vrouter namespace + +Change-Id: I123af7e3b53f9a53fcd9d2818640c0bd4699e024 +Closes-Bug: #1595957 +(cherry picked from commit 244456a3b77074a6cd85fa9d33ebb03ac25decf8) +--- + files/fuel-ha-utils/ocf/ns_dns | 3 ++- + files/fuel-ha-utils/ocf/ns_vrouter | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/files/fuel-ha-utils/ocf/ns_dns b/files/fuel-ha-utils/ocf/ns_dns +index cdd814c..49cbd17 100644 +--- a/files/fuel-ha-utils/ocf/ns_dns ++++ b/files/fuel-ha-utils/ocf/ns_dns +@@ -140,7 +140,7 @@ exit $OCF_SUCCESS + + check_ns() { + local ns=`ip netns list | grep "$OCF_RESKEY_ns"` +- [ $ns != $OCF_RESKEY_ns ] && return $OCF_ERR_GENERIC ++ [ "$ns" != $OCF_RESKEY_ns ] && return $OCF_ERR_GENERIC + return $OCF_SUCCESS + } + +@@ -150,6 +150,7 @@ get_ns() { + + ocf_run ip netns add $OCF_RESKEY_ns + rc=$? ++ ocf_run $RUN_IN_NS /sbin/sysctl -w net.ipv4.ip_nonlocal_bind=1 + ocf_run $RUN_IN_NS ip link set up dev lo + + return $rc +diff --git a/files/fuel-ha-utils/ocf/ns_vrouter b/files/fuel-ha-utils/ocf/ns_vrouter +index a65e9cf..5cc6c98 100644 +--- a/files/fuel-ha-utils/ocf/ns_vrouter ++++ b/files/fuel-ha-utils/ocf/ns_vrouter +@@ -186,7 +186,7 @@ check_ns() { + local LH="${LL} check_ns():" + local ns=`ip netns list | grep "$OCF_RESKEY_ns"` + ocf_log debug "${LH} recieved netns list: ${ns}" +- [[ $ns != $OCF_RESKEY_ns ]] && return $OCF_ERR_GENERIC ++ [[ "$ns" != $OCF_RESKEY_ns ]] && return $OCF_ERR_GENERIC + return $OCF_SUCCESS + } + +@@ -197,6 +197,7 @@ get_ns() { + + ocf_run ip netns add $OCF_RESKEY_ns + rc=$? ++ ocf_run $RUN_IN_NS /sbin/sysctl -w net.ipv4.ip_nonlocal_bind=1 + ocf_run $RUN_IN_NS ip link set up dev lo + ocf_log debug "${LH} added netns ${OCF_RESKEY_ns} and set up lo" + diff --git a/patches/fuel-library/upstream-backports/0002-Always-wait-for-MySQL-sync-on-service-refresh.patch b/patches/fuel-library/upstream-backports/0002-Always-wait-for-MySQL-sync-on-service-refresh.patch new file mode 100644 index 00000000..d7fac948 --- /dev/null +++ b/patches/fuel-library/upstream-backports/0002-Always-wait-for-MySQL-sync-on-service-refresh.patch @@ -0,0 +1,60 @@ +From: dmburmistrov <dmburmistrov@mirantis.com> +Date: Thu, 18 Aug 2016 21:30:26 +0300 +Subject: [PATCH] Always wait for MySQL sync on service refresh + +Always trigger Exec['wait-for-sync'] on +MySQL service refresh. + +Closes-bug: #1614647 + +Change-Id: I82ec0d46eff217daedc1bd07c67069498c515c44 +--- + deployment/puppet/cluster/manifests/mysql.pp | 6 +++--- + deployment/puppet/cluster/spec/classes/cluster_mysql_spec.rb | 6 +++++- + 2 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/deployment/puppet/cluster/manifests/mysql.pp b/deployment/puppet/cluster/manifests/mysql.pp +index c36b65d..f483cf6 100644 +--- a/deployment/puppet/cluster/manifests/mysql.pp ++++ b/deployment/puppet/cluster/manifests/mysql.pp +@@ -104,7 +104,7 @@ class cluster::mysql ( + require => Package['mysql-server'], + } ~> + +- exec { 'wait-initial-sync': ++ exec { 'wait-for-sync': + path => '/bin:/sbin:/usr/bin:/usr/sbin', + command => "mysql ${user_password_string} -Nbe \"show status like 'wsrep_local_state_comment'\" | grep -q -e Synced && sleep 10", + try_sleep => 10, +@@ -119,7 +119,7 @@ class cluster::mysql ( + } + + Exec['create-init-file'] -> +- Service<| title == $service_name |> -> +- Exec['wait-initial-sync'] -> ++ Service<| title == $service_name |> ~> ++ Exec['wait-for-sync'] -> + Exec['rm-init-file'] + } +diff --git a/deployment/puppet/cluster/spec/classes/cluster_mysql_spec.rb b/deployment/puppet/cluster/spec/classes/cluster_mysql_spec.rb +index cf2c719..72c8c2f 100644 +--- a/deployment/puppet/cluster/spec/classes/cluster_mysql_spec.rb ++++ b/deployment/puppet/cluster/spec/classes/cluster_mysql_spec.rb +@@ -34,12 +34,16 @@ describe 'cluster::mysql' do + /'username'@'localhost' IDENTIFIED BY 'password'/ + ) + should contain_exec('create-init-file').that_comes_before('Service[mysqld]') +- should contain_exec('create-init-file').that_notifies('Exec[wait-initial-sync]') ++ should contain_exec('create-init-file').that_notifies('Exec[wait-for-sync]') + end + + it 'creates exec to remove init-file' do + should contain_exec('rm-init-file') + end ++ ++ it 'creates exec to wait initial database sync' do ++ should contain_exec('wait-for-sync').that_subscribes_to('Service[mysqld]') ++ end + end + + end diff --git a/patches/fuel-library/upstream-backports/0003-Fix-MySQL-logging-dir-permissions-for-syslog.patch b/patches/fuel-library/upstream-backports/0003-Fix-MySQL-logging-dir-permissions-for-syslog.patch new file mode 100644 index 00000000..7dfede1b --- /dev/null +++ b/patches/fuel-library/upstream-backports/0003-Fix-MySQL-logging-dir-permissions-for-syslog.patch @@ -0,0 +1,90 @@ +From: Maksim Malchuk <mmalchuk@mirantis.com> +Date: Wed, 24 Aug 2016 00:15:02 +0300 +Subject: [PATCH] Fix MySQL logging dir permissions for syslog + +This change fixes permissions for MySQL logging directory to enable +syslogd create and write logs files into it. + +Closes-Bug: #1615680 +Change-Id: Id29aead6619ea8ed68811d0fd80895ee79f51687 +Signed-off-by: Maksim Malchuk <mmalchuk@mirantis.com> +(cherry picked from commit 9c978278811eeebfb11ab4d2b42ebabe00c132c2) +--- + deployment/puppet/cluster/manifests/mysql.pp | 14 +++++++++++--- + .../puppet/cluster/spec/classes/cluster_mysql_spec.rb | 11 ++++++++++- + tests/noop/spec/hosts/database/database_spec.rb | 9 +++++++++ + 3 files changed, 30 insertions(+), 4 deletions(-) + +diff --git a/deployment/puppet/cluster/manifests/mysql.pp b/deployment/puppet/cluster/manifests/mysql.pp +index f483cf6..7bc8874 100644 +--- a/deployment/puppet/cluster/manifests/mysql.pp ++++ b/deployment/puppet/cluster/manifests/mysql.pp +@@ -118,8 +118,16 @@ class cluster::mysql ( + onlyif => 'test -f /tmp/wsrep-init-file', + } + ++ file { 'fix-log-dir': ++ ensure => directory, ++ path => '/var/log/mysql', ++ mode => '0770', ++ require => Package['mysql-server'], ++ } ++ + Exec['create-init-file'] -> +- Service<| title == $service_name |> ~> +- Exec['wait-for-sync'] -> +- Exec['rm-init-file'] ++ File['fix-log-dir'] -> ++ Service<| title == $service_name |> ~> ++ Exec['wait-for-sync'] -> ++ Exec['rm-init-file'] + } +diff --git a/deployment/puppet/cluster/spec/classes/cluster_mysql_spec.rb b/deployment/puppet/cluster/spec/classes/cluster_mysql_spec.rb +index 72c8c2f..ad3fc1b 100644 +--- a/deployment/puppet/cluster/spec/classes/cluster_mysql_spec.rb ++++ b/deployment/puppet/cluster/spec/classes/cluster_mysql_spec.rb +@@ -33,7 +33,7 @@ describe 'cluster::mysql' do + should contain_exec('create-init-file').with_command( + /'username'@'localhost' IDENTIFIED BY 'password'/ + ) +- should contain_exec('create-init-file').that_comes_before('Service[mysqld]') ++ should contain_exec('create-init-file').that_comes_before('File[fix-log-dir]') + should contain_exec('create-init-file').that_notifies('Exec[wait-for-sync]') + end + +@@ -41,6 +41,15 @@ describe 'cluster::mysql' do + should contain_exec('rm-init-file') + end + ++ it 'should have correct permissions for logging directory' do ++ should contain_file('fix-log-dir').with( ++ :ensure => 'directory', ++ :path => '/var/log/mysql', ++ :mode => '0770', ++ ).that_requires('Package[mysql-server]') ++ should contain_file('fix-log-dir').that_comes_before('Service[mysqld]') ++ end ++ + it 'creates exec to wait initial database sync' do + should contain_exec('wait-for-sync').that_subscribes_to('Service[mysqld]') + end +diff --git a/tests/noop/spec/hosts/database/database_spec.rb b/tests/noop/spec/hosts/database/database_spec.rb +index d4ad8d0..2c4c5c5 100644 +--- a/tests/noop/spec/hosts/database/database_spec.rb ++++ b/tests/noop/spec/hosts/database/database_spec.rb +@@ -261,6 +261,15 @@ describe manifest do + ) + end + ++ it 'should have correct permissions for logging directory' do ++ should contain_file('fix-log-dir').with( ++ :ensure => 'directory', ++ :path => '/var/log/mysql', ++ :mode => '0770', ++ ).that_requires('Package[mysql-server]') ++ should contain_file('fix-log-dir').that_comes_before('Service[mysqld]') ++ end ++ + it 'should configure galera grants service and proper flow' do + if primary_controller + should contain_class('cluster::galera_grants').with( |