commit 26c8a6c448cb1dd108db5c0f0b48cc568d8c7e43
author Oleg Grigorov <ohryhorov@mirantis.com> Thu Aug 17 18:54:02 2017 +0300
committer Oleh Hryhorov <ohryhorov@mirantis.com> Thu Sep 07 12:22:10 2017 +0000
tree cbfec698d8fe9c294f6b5699ec712d63c8918510
parent 30ba104df3ba8b03a808a81d48b3f5d8aa48872b

To fix sporadic keystone errors occur during multinode installation

In order to avoid keystone sporadical errors related to keys directory
mounted by glusterfs during multinode configuration glusterfs cluster
should be assembled before keystone.server state in installOpenstackControl()
function. To perform the above installation steps of componets should
have to be changed.

Change-Id: Ic5144af6dc436b338dcef7b8288122dc998cdc7a
Depends-On: I69d33a5b3478925425e3441c28c34d5249d35af0
Related-Prod: PROD-13874

src/com/mirantis/mk/Orchestrate.groovy

diff --git a/src/com/mirantis/mk/Orchestrate.groovy b/src/com/mirantis/mk/Orchestrate.groovy
index 7cb35f8..c24f9b6 100644
--- a/src/com/mirantis/mk/Orchestrate.groovy
+++ b/src/com/mirantis/mk/Orchestrate.groovy
@@ -67,6 +67,11 @@
         salt.runSaltProcessStep(master, 'I@glusterfs:server', 'cmd.run', ['gluster volume status'], null, true)
     }
 
+    // Ensure glusterfs clusters is ready
+    if (salt.testTarget(master, 'I@glusterfs:client')) {
+        salt.enforceState(master, 'I@glusterfs:client', 'glusterfs.client', true)
+    }
+
     // Install galera
     if (salt.testTarget(master, 'I@galera:master') || salt.testTarget(master, 'I@galera:slave')) {
         withEnv(['ASK_ON_ERROR=false']){
@@ -169,24 +174,16 @@
         salt.runSaltProcessStep(master, 'I@keystone:server', 'cmd.run', ['. /root/keystonercv3; openstack service list'], null, true)
     }
 
-    // Install glance and ensure glusterfs clusters
+    // Install glance
     if (salt.testTarget(master, 'I@glance:server')) {
         //runSaltProcessStep(master, 'I@glance:server', 'state.sls', ['glance.server'], 1)
         salt.enforceState(master, 'I@glance:server and *01*', 'glance.server', true)
        salt.enforceState(master, 'I@glance:server', 'glance.server', true)
     }
-    if (salt.testTarget(master, 'I@glusterfs:client')) {
-        salt.enforceState(master, 'I@glusterfs:client', 'glusterfs.client', true)
-    }
 
-    // Update fernet tokens before doing request on keystone server
-    if (salt.testTarget(master, 'I@keystone:server')) {
-        salt.enforceState(master, 'I@keystone:server', 'keystone.server', true)
-
-        // Check glance service
-        if (salt.testTarget(master, 'I@glance:server')){
-            salt.runSaltProcessStep(master, 'I@keystone:server', 'cmd.run', ['. /root/keystonerc; glance image-list'], null, true)
-        }
+    // Check glance service
+    if (salt.testTarget(master, 'I@glance:server')){
+        salt.runSaltProcessStep(master, 'I@keystone:server', 'cmd.run', ['. /root/keystonerc; glance image-list'], null, true)
     }
 
     // Create glance resources