From 48c455e0361df3e33a79ef644a135c0d33468222 Mon Sep 17 00:00:00 2001
From: Arie Peterson <arie@greenhost.nl>
Date: Fri, 29 Nov 2019 11:21:01 +0100
Subject: [PATCH] Move local_flux conditional from role to playbook
---
ansible/bootstrap.yml | 1 +
ansible/roles/local-flux/tasks/main.yml | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/ansible/bootstrap.yml b/ansible/bootstrap.yml
index 35cd4f6bf..f895ea5d3 100644
--- a/ansible/bootstrap.yml
+++ b/ansible/bootstrap.yml
@@ -63,6 +63,7 @@
- import_role:
name: local-flux
tags: ['flux']
+ when: local_flux
always:
- import_role:
name: finalize
diff --git a/ansible/roles/local-flux/tasks/main.yml b/ansible/roles/local-flux/tasks/main.yml
index 6a42539fd..cfd9d6b9c 100644
--- a/ansible/roles/local-flux/tasks/main.yml
+++ b/ansible/roles/local-flux/tasks/main.yml
@@ -49,4 +49,3 @@
vars:
repo: "/var/lib/OpenAppStack/local-flux"
- when: local_flux
--
GitLab