diff options
| author | Simon Rettberg | 2020-01-14 16:28:44 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2020-01-14 16:28:44 +0100 |
| commit | 36e78c8972ba4bcea46ab2b6de9e089a8fffe85f (patch) | |
| tree | 95e446068fe6edb63f8a3300849339816ac2cebd /modules-available/dnbd3/baseconfig/getconfig.inc.php | |
| parent | [inc/Util] Fix rounding based on OS bitness (diff) | |
| download | slx-admin-36e78c8972ba4bcea46ab2b6de9e089a8fffe85f.tar.gz slx-admin-36e78c8972ba4bcea46ab2b6de9e089a8fffe85f.tar.xz slx-admin-36e78c8972ba4bcea46ab2b6de9e089a8fffe85f.zip | |
[dnbd3] Always add DNBD3 servers to config (for stage4)
Also, change translations for "enable dnbd3" to refer to VMs
specifically.
Diffstat (limited to 'modules-available/dnbd3/baseconfig/getconfig.inc.php')
| -rw-r--r-- | modules-available/dnbd3/baseconfig/getconfig.inc.php | 15 |
1 files changed, 8 insertions, 7 deletions
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 |