From 36e78c8972ba4bcea46ab2b6de9e089a8fffe85f Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 14 Jan 2020 16:28:44 +0100
Subject: [dnbd3] Always add DNBD3 servers to config (for stage4)

Also, change translations for "enable dnbd3" to refer to VMs
specifically.
---
 modules-available/dnbd3/baseconfig/getconfig.inc.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'modules-available/dnbd3/baseconfig')

diff --git a/modules-available/dnbd3/baseconfig/getconfig.inc.php b/modules-available/dnbd3/baseconfig/getconfig.inc.php
index 6f484fc5..ca0f7a9a 100644
--- a/modules-available/dnbd3/baseconfig/getconfig.inc.php
+++ b/modules-available/dnbd3/baseconfig/getconfig.inc.php
@@ -1,11 +1,13 @@
 <?php
 
-if (!Dnbd3::isEnabled()) return;
+if (Dnbd3::isEnabled()) {
+	if (!Dnbd3::hasNfsFallback()) {
+		ConfigHolder::add("SLX_VM_NFS", false, 1000);
+		ConfigHolder::add("SLX_VM_NFS_USER", false, 1000);
+		ConfigHolder::add("SLX_VM_NFS_PASSWD", false, 1000);
+	}
 
-if (!Dnbd3::hasNfsFallback()) {
-	ConfigHolder::add("SLX_VM_NFS", false, 1000);
-	ConfigHolder::add("SLX_VM_NFS_USER", false, 1000);
-	ConfigHolder::add("SLX_VM_NFS_PASSWD", false, 1000);
+	ConfigHolder::add('SLX_VM_DNBD3', 'yes');
 }
 
 // Locations from closest to furthest (order)
@@ -62,5 +64,4 @@ foreach ($servers as $k => $v) {
 
 asort($servers, SORT_NUMERIC | SORT_ASC);
 ConfigHolder::add('SLX_DNBD3_SERVERS', implode(' ', array_keys($servers)));
-ConfigHolder::add('SLX_DNBD3_FALLBACK', implode(' ', array_keys($fallback)));
-ConfigHolder::add('SLX_VM_DNBD3', 'yes');
+ConfigHolder::add('SLX_DNBD3_FALLBACK', implode(' ', array_keys($fallback)));
\ No newline at end of file
-- 
cgit v1.2.3-55-g7522