From 142c944e0fa3e034b97ad09584df1f35adfce231 Mon Sep 17 00:00:00 2001
From: Lukas Bezdicka <lbezdick@redhat.com>
Date: Mon, 25 Feb 2019 19:18:09 +0100
Subject: [PATCH] [FFU] Ensure compatibility with ansible 2.6.

Ansible 2.6 fix didn't properly selct bootstrap node. Also
new ansible changed mysql backend library making it unable
to read misformated my.cnf. This library also needs to have
socket specified if it's going to connect to local server.

Change-Id: I31b38eaf66bb899e72b1bfeca8795e5d1007eee5
Resolves: rhbz#1678235
Closes-bug: #1816422
---
 common/deploy-steps.j2                        | 4 +++-
 docker/services/database/mysql.yaml           | 7 +++++++
 docker/services/pacemaker/database/mysql.yaml | 7 +++++++
 puppet/services/database/mysql.yaml           | 2 ++
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index 062dabf7ce..cb6f4b70ab 100644
--- a/common/deploy-steps.j2
+++ b/common/deploy-steps.j2
@@ -854,7 +854,9 @@ outputs:
       fast_forward_upgrade_bootstrap_role_tasks: |
 {%- for role in roles %}
                 - include_tasks: {{role.name}}/fast_forward_upgrade_tasks.yaml
-                  when: tripleo_role_name == '{{role.name}}' and ansible_hostname == groups['{{role.name}}'][0]
+                  when:
+                    - tripleo_role_name == '{{role.name}}'
+                    - is_bootstrap_node|bool
 {%- endfor %}
       post_update_steps_tasks: |
 {%- for role in roles %}
diff --git a/docker/services/database/mysql.yaml b/docker/services/database/mysql.yaml
index d98f156888..254515860f 100644
--- a/docker/services/database/mysql.yaml
+++ b/docker/services/database/mysql.yaml
@@ -332,13 +332,20 @@ outputs:
             - release == 'ocata'
             - is_bootstrap_node|bool
           block:
+            - name: Remove whitespaces in .my.cnf
+              replace:
+                path: /root/.my.cnf
+                regexp: '^ +'
+                replace: ''
             - name: Create cell0 db
               mysql_db:
                 name: nova_cell0
                 state: present
+                login_unix_socket: '/var/lib/mysql/mysql.sock'
             - name: Grant access to cell0 db
               mysql_user:
                 name: nova
                 host_all: yes
                 state: present
                 priv: '*.*:ALL'
+                login_unix_socket: '/var/lib/mysql/mysql.sock'
diff --git a/docker/services/pacemaker/database/mysql.yaml b/docker/services/pacemaker/database/mysql.yaml
index 2f166f99c4..6970893174 100644
--- a/docker/services/pacemaker/database/mysql.yaml
+++ b/docker/services/pacemaker/database/mysql.yaml
@@ -572,13 +572,20 @@ outputs:
             - release == 'ocata'
             - is_bootstrap_node|bool
           block:
+            - name: Remove whitespaces in .my.cnf
+              replace:
+                path: /root/.my.cnf
+                regexp: '^ +'
+                replace: ''
             - name: Create cell0 db
               mysql_db:
                 name: nova_cell0
                 state: present
+                login_unix_socket: '/var/lib/mysql/mysql.sock'
             - name: Grant access to cell0 db
               mysql_user:
                 name: nova
                 host_all: yes
                 state: present
                 priv: '*.*:ALL'
+                login_unix_socket: '/var/lib/mysql/mysql.sock'
diff --git a/puppet/services/database/mysql.yaml b/puppet/services/database/mysql.yaml
index 4295be5503..60e5171b55 100644
--- a/puppet/services/database/mysql.yaml
+++ b/puppet/services/database/mysql.yaml
@@ -184,9 +184,11 @@ outputs:
           mysql_db:
             name: nova_cell0
             state: present
+            login_unix_socket: '/var/lib/mysql/mysql.sock'
         - name: Setup cell_v2 (grant access to the nova DB user)
           when: step|int == 4
           mysql_user:
+            login_unix_socket: '/var/lib/mysql/mysql.sock'
             str_replace:
               template: "name=nova password=PASSWORD host=\"%\" priv=\"nova.*:ALL/nova_cell0.*:ALL,GRANT\" state=present"
               params: