move horizon installation to the top
Change-Id: I7ede8dac1d44f0d7805188e6d26659f5b611a467
diff --git a/lab-pipeline.groovy b/lab-pipeline.groovy
index 00ba743..22e28f2 100644
--- a/lab-pipeline.groovy
+++ b/lab-pipeline.groovy
@@ -292,6 +292,10 @@
stage('Install OpenStack control') {
//orchestrate.installOpenstackMkControl(saltMaster)
+ // Install horizon dashboard
+ salt.enforceState(saltMaster, 'I@horizon:server', 'horizon', true)
+ salt.enforceState(saltMaster, 'I@nginx:server', 'nginx', true)
+
// setup keystone service
//runSaltProcessStep(saltMaster, 'I@keystone:server', 'state.sls', ['keystone.server'], 1)
salt.enforceState(saltMaster, 'I@keystone:server and *01*', 'keystone.server', true)
@@ -339,10 +343,6 @@
salt.enforceState(saltMaster, 'I@heat:server', 'heat', true)
salt.runSaltProcessStep(saltMaster, 'I@keystone:server', 'cmd.run', ['. /root/keystonerc; heat resource-type-list'], null, true)
- // Install horizon dashboard
- salt.enforceState(saltMaster, 'I@horizon:server', 'horizon', true)
- salt.enforceState(saltMaster, 'I@nginx:server', 'nginx', true)
-
}
stage('Install OpenStack network') {