mirror of
https://github.com/retspen/webvirtcloud
synced 2024-12-24 23:25:24 +00:00
Merge pull request #638 from catborise/master
fix default nic type problem
This commit is contained in:
commit
3f23acbb9d
4 changed files with 27 additions and 1 deletions
20
appsettings/migrations/0011_alter_appsettings_id.py
Normal file
20
appsettings/migrations/0011_alter_appsettings_id.py
Normal file
|
@ -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"
|
||||||
|
),
|
||||||
|
),
|
||||||
|
]
|
|
@ -660,7 +660,9 @@
|
||||||
<div class="clearfix"></div>
|
<div class="clearfix"></div>
|
||||||
</div>
|
</div>
|
||||||
<div role="tabpanel" class="tab-pane tab-pane-bordered" id="xmledit">
|
<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">
|
<form action="{% url 'instances:change_xml' instance.id %}" method="post" role="form" aria-label="Edit instance XML form">
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
<div class="col-sm-12" id="xmlheight">
|
<div class="col-sm-12" id="xmlheight">
|
||||||
|
|
|
@ -1853,6 +1853,9 @@ def create_instance(request, compute_id, arch, machine):
|
||||||
machine = "q35"
|
machine = "q35"
|
||||||
firmware["secure"] = "yes"
|
firmware["secure"] = "yes"
|
||||||
|
|
||||||
|
if data["net_model"] == "default":
|
||||||
|
data["net_model"] = "virtio"
|
||||||
|
|
||||||
uuid = util.randomUUID()
|
uuid = util.randomUUID()
|
||||||
try:
|
try:
|
||||||
conn.create_instance(
|
conn.create_instance(
|
||||||
|
|
|
@ -197,6 +197,7 @@ create_user () {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
usermod -a -G "$nginx_group" "$APP_USER"
|
usermod -a -G "$nginx_group" "$APP_USER"
|
||||||
|
usermod -a -G libvirt "$nginx_group"
|
||||||
}
|
}
|
||||||
|
|
||||||
run_as_app_user () {
|
run_as_app_user () {
|
||||||
|
|
Loading…
Reference in a new issue