diff --git a/ansible/group_vars/all/oas.yml b/ansible/group_vars/all/oas.yml index 0f3808e827afa014ef6632aa5b28cba8fb605bae..77ee8c694a7b2bb622d099c784e7f25f9f99f014 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 a3927bd8743b01527ccdd53e3db227075569c879..51cf07f4f49b1fbd28d0bfae6677acd08cc9f4a6 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)