diff --git a/appsettings/migrations/0007_auto_20220629_1213.py b/appsettings/migrations/0007_auto_20220629_1213.py
deleted file mode 100644
index e9f2ed5..0000000
--- a/appsettings/migrations/0007_auto_20220629_1213.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# Generated by Django 3.2.12 on 2022-06-29 12:13
-
-from django.db import migrations
-from django.utils.translation import gettext_lazy as _
-
-
-def add_default_settings(apps, schema_editor):
- setting = apps.get_model("appsettings", "AppSettings")
- db_alias = schema_editor.connection.alias
- setting.objects.using(db_alias).bulk_create([
- setting(31, _("VM DRBD Status"), "VM_DRBD_STATUS", "False", "True,False", _("Show VM DRBD Status")),
- ])
-
-
-def del_default_settings(apps, schema_editor):
- setting = apps.get_model("appsettings", "AppSettings")
- db_alias = schema_editor.connection.alias
- setting.objects.using(db_alias).filter(key="VM_DRBD_STATUS").delete()
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('appsettings', '0006_alter_appsettings_id'),
- ]
-
- operations = [
- migrations.RunPython(add_default_settings, del_default_settings),
- ]
diff --git a/instances/templates/allinstances_index_grouped.html b/instances/templates/allinstances_index_grouped.html
index bdeda51..a6c3bc6 100644
--- a/instances/templates/allinstances_index_grouped.html
+++ b/instances/templates/allinstances_index_grouped.html
@@ -7,9 +7,7 @@
{% trans "Name" %} {% trans "Description" %} |
{% trans "User"%} |
{% trans "Status" %} |
- {% if app_settings.VM_DRBD_STATUS == 'True' %}
{% trans "Role/Disk" %} |
- {% endif %}
{% trans "VCPU" %} |
{% trans "Memory" %} |
{% trans "Actions" %} & {% trans "Mem Usage" %} |
@@ -30,9 +28,7 @@
{% trans "Connected" %}
|
- {% if app_settings.VM_DRBD_STATUS == 'True' %}
|
- {% endif %}
{{ compute.cpu_count }} |
{{ compute.ram_size|filesizeformat }} |
@@ -68,11 +64,9 @@
{% trans "Suspended" %}
{% endif %}
|
- {% if app_settings.VM_DRBD_STATUS == 'True' %}
{% if instance.drbd == "Primary/OK" or instance.drbd == "Secondary/OK" %}{% else %}{% endif %}{{ instance.drbd }}
|
- {% endif %}
{{ instance.proxy.instance.info.3 }} |
{{ instance.cur_memory }} MB |
diff --git a/instances/templates/allinstances_index_nongrouped.html b/instances/templates/allinstances_index_nongrouped.html
index a836fa7..114b6b8 100644
--- a/instances/templates/allinstances_index_nongrouped.html
+++ b/instances/templates/allinstances_index_nongrouped.html
@@ -7,9 +7,7 @@
| {% trans 'Host' %} {% trans 'User' %} |
{% endif %}
{% trans 'Status' %} |
- {% if app_settings.VM_DRBD_STATUS == 'True' %}
{% trans 'Role/Disk' %} |
- {% endif %}
{% trans 'VCPU' %} |
{% trans 'Memory' %} |
{% trans 'Actions' %} |
@@ -47,11 +45,9 @@
{% if instance.proxy.instance.info.0 == 3 %}{% trans "Suspended" %}{% endif %}
- {% if app_settings.VM_DRBD_STATUS == 'True' %}
{% if instance.drbd == "Primary/OK" or instance.drbd == "Secondary/OK" %}{% else %}{% endif %}{{ instance.drbd }}
|
- {% endif %}
{{ instance.proxy.instance.info.3 }} |
{{ instance.cur_memory }} MB |
diff --git a/instances/views.py b/instances/views.py
index 449fc7b..ff8702c 100644
--- a/instances/views.py
+++ b/instances/views.py
@@ -128,9 +128,8 @@ def instance(request, pk):
storages_host = sorted(instance.proxy.get_storages(True))
net_models_host = instance.proxy.get_network_models()
- if app_settings.VM_DRBD_STATUS == 'True':
- instance.drbd = drbd_status(request, pk)
- instance.save()
+ instance.drbd = drbd_status(request, pk)
+ instance.save()
return render(request, "instance.html", locals())
diff --git a/webvirtcloud/settings.py.template b/webvirtcloud/settings.py.template
index ffaacf3..984f2a1 100644
--- a/webvirtcloud/settings.py.template
+++ b/webvirtcloud/settings.py.template
@@ -265,7 +265,7 @@ USE_SSL = False
## The user with search rights on ldap. (e.g cn=admin,dc=kendar,dc=org)
LDAP_MASTER_DN = ''
LDAP_MASTER_PW_ENC = ''
-LDAP_MASTER_PW = subprocess.Popen(["bash", str(BASE_DIR) + "/webvirtcloud/.dec_ldap_pwd.sh", LDAP_MASTER_PW_ENC],stdout=subprocess.PIPE, encoding='utf8').stdout.read().strip('\n')
+LDAP_MASTER_PW = subprocess.Popen(["bash", str(BASE_DIR) + "/webvirtcloud/.dec_ldap_pwd.sh", LDAP_MASTER_PW_ENC],stdout=subprocess.PIPE, text=True).stdout.read().strip('\n')
## The root dn (e.g. dc=kendar,dc=org)
LDAP_ROOT_DN = ''
## Queries to identify the users, i use groupOfUniqueNames on openldap
|