Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Removed the log file from being commited #136

Merged
merged 1 commit into from
Nov 14, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,7 @@ db.sqlite3

# API
bb_api/templates/api_docs_source/build/*

# Logs
logs/*
!logs/.gitkeep
2 changes: 1 addition & 1 deletion bb_vm/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class VirtualBrickAdmin(admin.ModelAdmin):
'''
Admin configuration for VirtualBrick model.
'''
list_display = ('id', 'domain_uuid', 'ssh_port', 'img_cloned', 'is_rebooting', 'is_on')
list_display = ('id', 'domain_uuid', 'host', 'ssh_port', 'img_cloned', 'is_rebooting', 'is_on')

class VirtualBrickOwnerAdmin(admin.ModelAdmin):
'''
Expand Down
9 changes: 9 additions & 0 deletions bb_vm/bash_scripts/brick_prep.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,15 @@ if [ ! -d /sys/class/net/br0 ]; then
sudo dhclient -r br0 && sudo dhclient br0
fi

# Verify that br0 has an IP address.
if [[ $(ip -f inet addr show br0) ]] ; then
echo "br0 has an IP address."
else
echo "br0 does not have an IP address."
sudo dhclient -r br0 && sudo dhclient br0
fi


# Verify base image exists. (Need to change to long lasting task)
if [ ! -f /var/lib/libvirt/images/brickbox-U20.04.img ]; then
curl https://os-imgs.nyc3.digitaloceanspaces.com/brickbox-U20.04.img \
Expand Down
1 change: 1 addition & 0 deletions bb_vm/bash_scripts/logs/.gitkeep
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Placeholder so that the folder is added to GitHub but not the contents.
4 changes: 4 additions & 0 deletions bb_vm/bash_scripts/logs/brick_connect_errors.log
Original file line number Diff line number Diff line change
Expand Up @@ -910,3 +910,7 @@ Connection to localhost closed by remote host.
kex_exchange_identification: read: Connection reset by peer
Killed old client process
Connection to localhost closed by remote host.
Killed old client process
% Total % Received % Xferd Average Speed Time Time Time Current
Dload Upload Total Spent Left Speed
0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0100 212 100 158 100 54 863 295 --:--:-- --:--:-- --:--:-- 1158
Expand Down
2 changes: 1 addition & 1 deletion bb_vm/views_host.py
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ def onboarding_gpu(request, host_serial):
pcie=gpu_pcie, device=gpu_device
)

with open("/opt/brickbox/bb_vm/xml/ gpu.xml", encoding="utf-8") as gpu_xml:
with open("/opt/brickbox/bb_vm/xml/gpu.xml", encoding="utf-8") as gpu_xml:
gpu_xml = gpu_xml.read()
new_gpu.xml = gpu_xml.format(bus=bus)
new_gpu.save()
Expand Down