fuel-library: mysql: Fix spurious install timeouts

Backport the following fuel-library fixes from Fuel 9.1:
- wrong relationship in clusters mysql manifest
- Rsyslog doesn't have write permission to /var/log/mysql/ directory

These two bugs manifested as:
- random deploy issues waiting for MySQL to sync, without the server
  being installed;
- no MySQL logs were saved due to permission issues;

Closes-bug: ARMBAND-78

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

1 files changed, 60 insertions, 0 deletions

diff --git a/patches/fuel-library/0017-Always-wait-for-MySQL-sync-on-service-refresh.patch b/patches/fuel-library/0017-Always-wait-for-MySQL-sync-on-service-refresh.patch
new file mode 100644
index 00000000..e0704110
--- /dev/null
+++ b/patches/fuel-library/0017-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: 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 0b766c5..055b931 100644
+--- a/deployment/puppet/cluster/manifests/mysql.pp
++++ b/deployment/puppet/cluster/manifests/mysql.pp
+@@ -111,7 +111,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,
+@@ -126,7 +126,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 be00056..e4d62c4 100644
+--- a/deployment/puppet/cluster/spec/classes/cluster_mysql_spec.rb
++++ b/deployment/puppet/cluster/spec/classes/cluster_mysql_spec.rb
+@@ -39,12 +39,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