j3d1/webvirtcloud
1
0
Fork 0
mirror of https://github.com/retspen/webvirtcloud synced 2024-12-25 15:45:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #264 from catborise/master

Browse source 
Debian10 installation & And Qos fix
This commit is contained in:
Anatoliy Guskov 2019-11-22 19:05:52 +02:00 committed by GitHub
commit b816bb28e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dev/libvirt-bootstrap.sh
View file

@ -662,7 +662,10 @@ daemons_running_ubuntu() {
# #
install_debian() { install_debian() {
apt-get update || return 1 apt-get update || return 1
if [ $DISTRO_MAJOR_VERSION -lt 10 ]; then
apt-get -y install qemu-kvm libvirt-bin bridge-utils sasl2-bin python-guestfs supervisor || return 1 apt-get -y install qemu-kvm libvirt-bin bridge-utils sasl2-bin python-guestfs supervisor || return 1
else
apt-get -y install qemu qemu-kvm qemu-system qemu-utils libvirt-clients libvirt-daemon-system sasl2-bin virtinst supervisor || return 1
return 0 return 0
} }

9
instances/templates/instance.html
View file

@ -855,6 +855,7 @@
<th>{% trans 'MAC' %}</th> <th>{% trans 'MAC' %}</th>
<th>{% trans 'NIC' %}</th> <th>{% trans 'NIC' %}</th>
<th>{% trans 'Filter' %}</th> <th>{% trans 'Filter' %}</th>
<th>{% trans 'Qos' %}</th>
<th>{% trans 'Actions' %}</th> <th>{% trans 'Actions' %}</th>
</tr> </tr>
</thead> </thead>
@ -865,6 +866,12 @@
<td><input class="form-control" type="text" value="{{ network.mac }}" readonly/></td> <td><input class="form-control" type="text" value="{{ network.mac }}" readonly/></td>
<td><input class="form-control" type="text" value="{{ network.nic }}" readonly/></td> <td><input class="form-control" type="text" value="{{ network.nic }}" readonly/></td>
<td><input class="form-control" type="text" value="{{ network.filterref }}" readonly/></td> <td><input class="form-control" type="text" value="{{ network.filterref }}" readonly/></td>
<td>
<form class="form-horizontal" method="post" name="add_qos{{ forloop.counter0 }}" role="form">{% csrf_token %}
<input type="text" name="net-mac-{{ forloop.counter0 }}" value="{{ network.mac }}" hidden/>
{% include 'add_network_qos.html' with id=forloop.counter0 %}
</form>
</td>
<td class="col-sm-2"> <td class="col-sm-2">
<form class="form-horizontal" method="post" name="set_qos{{ forloop.counter0 }}" role="form">{% csrf_token %} <form class="form-horizontal" method="post" name="set_qos{{ forloop.counter0 }}" role="form">{% csrf_token %}
<button data-target="#editInstanceNetwork{{ forloop.counter0 }}" type="button" class="btn btn-sm btn-primary" <button data-target="#editInstanceNetwork{{ forloop.counter0 }}" type="button" class="btn btn-sm btn-primary"
@ -920,8 +927,6 @@
onclick="return confirm('{% trans "Are you sure?" %}')"> onclick="return confirm('{% trans "Are you sure?" %}')">
<i class="glyphicon glyphicon-trash"></i> <i class="glyphicon glyphicon-trash"></i>
</button> </button>
{% include 'add_network_qos.html' with id=forloop.counter0 %}
</form> </form>
</td> </td>
</tr> </tr>