commit 1fde38fc713b5e7f95ef319f30dc17b311d54e81
author Cedric Hnyda <chnyda@mirantis.com> Fri Nov 10 10:25:02 2017 +0000
committer Gerrit Code Review <gerrit2@44cc31867e31> Fri Nov 10 10:25:02 2017 +0000
tree bc34bdc1c785e6b9a24a3d25aa94a73c97eef306
parent f83409d6f48547f477b44494e277f6e039b6ae6f
parent 067d25e4124d845a28706c82c82229100d94d1e9

Merge "Adding workaround for trusty network init"

openstack-compute-install.groovy

diff --git a/openstack-compute-install.groovy b/openstack-compute-install.groovy
index f3b4ec3..82a3e40 100644
--- a/openstack-compute-install.groovy
+++ b/openstack-compute-install.groovy
@@ -38,6 +38,17 @@
             common.infoMsg("Selected nodes: ${targetLiveAll}")
         }
 
+        stage("Trusty workaround") {
+            if(salt.getGrain(saltMaster, minions[0], "oscodename")['return'][0].values()[0]["oscodename"] == "trusty") {
+                common.infoMsg("First node %nodename% has trusty")
+                common.infoMsg("Assuming trusty on all cluster, running extra network states...")
+                common.infoMsg("Network iteration #1. Bonding")
+                salt.enforceState(saltMaster, targetLiveAll, 'linux.network', true)
+                common.infoMsg("Network iteration #2. Vlan tagging and bridging")
+                salt.enforceState(saltMaster, targetLiveAll, 'linux.network', true)
+            }
+        }
+
         stage("Setup repositories") {
             salt.enforceState(pepperEnv, targetLiveAll, 'linux.system.repo', true)
         }