From 10ade65f626b04734bdf04f0aa0eb5f2ee47d411 Mon Sep 17 00:00:00 2001
From: Anton Markelov <doublic@gmail.com>
Date: Wed, 22 Nov 2017 11:31:29 +1000
Subject: [PATCH] Fix crash when new role added to requirements

---
 api/tasks/runner.go | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/api/tasks/runner.go b/api/tasks/runner.go
index b6b409d34..c633bc6ae 100644
--- a/api/tasks/runner.go
+++ b/api/tasks/runner.go
@@ -98,6 +98,12 @@ func (t *task) prepareRun() {
 		return
 	}
 
+	if err := t.runGalaxy(); err != nil {
+		t.log("Running galaxy failed: " + err.Error())
+		t.fail()
+		return
+	}
+
 	// todo: write environment
 
 	if err := t.listPlaybookHosts(); err != nil {
@@ -154,12 +160,6 @@ func (t *task) run() {
 	t.log("Started: " + strconv.Itoa(t.task.ID))
 	t.log("Run task with template: " + t.template.Alias + "\n")
 
-	if err := t.runGalaxy(); err != nil {
-		t.log("Running galaxy failed: " + err.Error())
-		t.fail()
-		return
-	}
-
 	if err := t.runPlaybook(); err != nil {
 		t.log("Running playbook failed: " + err.Error())
 		t.fail()