From 1013bf2431389ed78ca1442206addd8a3958c93d Mon Sep 17 00:00:00 2001
From: Varac <varac@varac.net>
Date: Thu, 5 Dec 2019 10:16:13 +0100
Subject: [PATCH] Install local_flux chart by default.
This is currenly needed to install OAS apps, so it shouldn't be configurable.
Fixes: #413
---
ansible/group_vars/all/oas.yml | 5 +++++
openappstack/cluster.py | 4 ----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ansible/group_vars/all/oas.yml b/ansible/group_vars/all/oas.yml
index 0f3808e82..77ee8c694 100644
--- a/ansible/group_vars/all/oas.yml
+++ b/ansible/group_vars/all/oas.yml
@@ -57,3 +57,8 @@ cert_manager:
prometheus:
crd_version: 'v0.34.0'
+
+# Let the auto-update mechanism (flux) follow a cluster-local git repo,
+# not one hosted on open.greenhost.net.
+# Currently needed in order to deploy OAS applications.
+local_flux: true
diff --git a/openappstack/cluster.py b/openappstack/cluster.py
index a3927bd87..51cf07f4f 100644
--- a/openappstack/cluster.py
+++ b/openappstack/cluster.py
@@ -41,9 +41,6 @@ class Cluster:
self.domain = None
# By default, use Let's Encrypt's live environment
self.acme_staging = False
- # Let the auto-update mechanism (flux) follow a cluster-local git repo,
- # not one hosted on open.greenhost.net.
- self.local_flux = True
# Set this to False if the data needs to be (re)loaded from file
self.data_loaded = False
# Load data from inventory.yml and settings.yml
@@ -150,7 +147,6 @@ class Cluster:
settings['domain'] = self.domain
settings['admin_email'] = 'admin@{0}'.format(self.domain)
settings['acme_staging'] = self.acme_staging
- settings['local_flux'] = self.local_flux
settings['cluster_dir'] = self.cluster_dir
file_contents = yaml.safe_dump(settings, default_flow_style=False)
--
GitLab