diff --git a/appsettings/migrations/0009_alter_appsettings_id.py b/appsettings/migrations/0009_alter_appsettings_id.py deleted file mode 100644 index 5e588dc..0000000 --- a/appsettings/migrations/0009_alter_appsettings_id.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 4.2.5 on 2023-10-30 17:00 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('appsettings', '0008_auto_20220905_1459'), - ] - - operations = [ - migrations.AlterField( - model_name='appsettings', - name='id', - field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), - ), - ] diff --git a/appsettings/migrations/0010_auto_20231030_1305.py b/appsettings/migrations/0010_auto_20231030_1305.py deleted file mode 100644 index 606909d..0000000 --- a/appsettings/migrations/0010_auto_20231030_1305.py +++ /dev/null @@ -1,28 +0,0 @@ -# Generated by Django 4.2.5 on 2023-10-30 17:05 - -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(35, _("VM NIC Type"), "INSTANCE_NIC_DEFAULT_TYPE", "default", "default,e1000,e1000e,rt18139,virtio", _("Change instance default NIC type")) - ]) - - -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="INSTANCE_NIC_DEFAULT_TYPE").delete() - - -class Migration(migrations.Migration): - - dependencies = [ - ('appsettings', '0009_alter_appsettings_id') - ] - - operations = [ - migrations.RunPython(add_default_settings,del_default_settings) - ] diff --git a/instances/templates/create_instance_w2.html b/instances/templates/create_instance_w2.html index 1cf7d62..91ae2ec 100644 --- a/instances/templates/create_instance_w2.html +++ b/instances/templates/create_instance_w2.html @@ -200,7 +200,7 @@
@@ -476,7 +476,7 @@
@@ -728,7 +728,7 @@
diff --git a/instances/views.py b/instances/views.py index cfaa157..57d1598 100755 --- a/instances/views.py +++ b/instances/views.py @@ -1692,7 +1692,6 @@ def create_instance(request, compute_id, arch, machine): networks = sorted(conn.get_networks()) nwfilters = conn.get_nwfilters() net_models_host = conn.get_network_models() - default_nic_type = app_settings.INSTANCE_NIC_DEFAULT_TYPE storages = sorted(conn.get_storages(only_actives=True)) default_graphics = app_settings.QEMU_CONSOLE_DEFAULT_TYPE default_cdrom = app_settings.INSTANCE_CDROM_ADD diff --git a/webvirtcloud.sh b/webvirtcloud.sh index b846b11..f66cb0f 100755 --- a/webvirtcloud.sh +++ b/webvirtcloud.sh @@ -424,15 +424,9 @@ until [[ $setupfqdn == "yes" ]] || [[ $setupfqdn == "no" ]]; do case $setupfqdn in [yY] | [yY][Ee][Ss] ) - fqdn=$(hostname --fqdn) - echo -n " Q. What is the FQDN of your server? ($fqdn): " - read -r fqdn_from_user + echo -n " Q. What is the FQDN of your server? ($(hostname --fqdn)): " + read -r fqdn setupfqdn="yes" - - if [ ! -z $fqdn_from_user ]; then - fqdn=$fqdn_from_user - fi - echo " Setting to $fqdn" echo "" ;;