Merge pull request retspen#638 from catborise/master

fix default nic type problem

Author: catborise

appsettings/migrations/0011_alter_appsettings_id.py

@@ -0,0 +1,20 @@
+# Generated by Django 4.2.10 on 2024-02-14 11:54
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("appsettings", "0010_auto_20231030_1305"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="appsettings",
+            name="id",
+            field=models.AutoField(
+                auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+            ),
+        ),
+    ]

instances/templates/instances/settings_tab.html

@@ -660,7 +660,9 @@ <h5 class="modal-title">{% trans "Edit Instance Network" %}</h5>
             <div class="clearfix"></div>
         </div>
         <div role="tabpanel" class="tab-pane tab-pane-bordered" id="xmledit">
-            <p>{% trans "If you need to edit XML please Power Off the instance" %}</p>
+            {% if instance.status != 5 %}
+                <p>{% trans "If you need to edit XML please Power Off the instance" %}</p>
+            {% endif %}
             <form action="{% url 'instances:change_xml' instance.id %}" method="post" role="form" aria-label="Edit instance XML form">
                 {% csrf_token %}
                 <div class="col-sm-12" id="xmlheight">

instances/views.py

@@ -1853,6 +1853,9 @@ def create_instance(request, compute_id, arch, machine):
                                 machine = "q35"
                                 firmware["secure"] = "yes"
 
+                        if data["net_model"] == "default":
+                            data["net_model"] = "virtio"
+
                         uuid = util.randomUUID()
                         try:
                             conn.create_instance(

webvirtcloud.sh

@@ -197,6 +197,7 @@ create_user () {
   fi
 
   usermod -a -G "$nginx_group" "$APP_USER"
+  usermod -a -G libvirt "$nginx_group"
 }
 
 run_as_app_user () {