Minor updates for local proxy in lxd container

This commit is contained in:
David A. Desrosiers 2019-05-23 05:21:31 +00:00
parent 82685ff2ff
commit 516cda5d33
2 changed files with 14 additions and 8 deletions

View File

@ -113,6 +113,7 @@ build_maas() {
maas $maas_profile maas set-config name=dnssec_validation value=no
maas $maas_profile maas set-config name=enable_analytics value=false
maas $maas_profile maas set-config name=enable_http_proxy value=true
maas $maas_profile maas set-config name=http_proxy value=http://192.168.100.10:3128/
maas $maas_profile maas set-config name=enable_third_party_drivers value=false
maas $maas_profile maas set-config name=curtin_verbose value=true
@ -175,7 +176,12 @@ clouds:
# endpoint: ${maas_endpoint:0:-8}
endpoint: $maas_endpoint
config:
apt-mirror: http://192.168.1.10:8765/mirror/ubuntu/
apt-mirror: http://192.168.100.1:8765/mirror/ubuntu/
apt-http-proxy: http://192.168.100.10:3128/
apt-https-proxy: http://192.168.100.10:3128/
snap-http-proxy: http://192.168.100.10:3128/
snap-https-proxy: http://192.168.100.10:3128/
snap-store-proxy: http://192.168.100.10:3128/
enable-os-refresh-update: true
enable-os-upgrade: false
logging-config: <root>=DEBUG

View File

@ -3,7 +3,7 @@
# set -x
storage_path="/storage/images/maas"
storage_format="qcow2"
storage_format="raw"
compute="maas-node"
node_count=20
node_start=1
@ -29,9 +29,9 @@ create_storage() {
for ((machine="$node_start"; machine<=node_count; machine++)); do
printf -v maas_node %s-%02d "$compute" "$machine"
mkdir -p "$storage_path/$maas_node"
/usr/bin/qemu-img create -f "$storage_format" -o preallocation=metadata,compat=1.1,lazy_refcounts=on "$storage_path/$maas_node/$maas_node-d1.img" "$d1"G &
/usr/bin/qemu-img create -f "$storage_format" -o preallocation=metadata,compat=1.1,lazy_refcounts=on "$storage_path/$maas_node/$maas_node-d2.img" "$d2"G &
/usr/bin/qemu-img create -f "$storage_format" -o preallocation=metadata,compat=1.1,lazy_refcounts=on "$storage_path/$maas_node/$maas_node-d3.img" "$d3"G &
/usr/bin/qemu-img create -f "$storage_format" "$storage_path/$maas_node/$maas_node-d1.img" "$d1"G &
/usr/bin/qemu-img create -f "$storage_format" "$storage_path/$maas_node/$maas_node-d2.img" "$d2"G &
/usr/bin/qemu-img create -f "$storage_format" "$storage_path/$maas_node/$maas_node-d3.img" "$d3"G &
done
}
@ -58,9 +58,9 @@ build_vms() {
--graphics spice,clipboard_copypaste=no,mouse_mode=client,filetransfer_enable=off \
--cpu host-passthrough,cache.mode=passthrough \
--controller "$bus",model=virtio-scsi,index=0 \
--disk path="$storage_path/$virt_node/$virt_node-d1.img,format=$storage_format,size=$d1,bus=$bus,io=native,cache=none" \
--disk path="$storage_path/$virt_node/$virt_node-d2.img,format=$storage_format,size=$d2,bus=$bus,io=native,cache=none" \
--disk path="$storage_path/$virt_node/$virt_node-d3.img,format=$storage_format,size=$d3,bus=$bus,io=native,cache=none" \
--disk path="$storage_path/$virt_node/$virt_node-d1.img,format=$storage_format,size=$d1,bus=$bus,io=native,cache=directsync" \
--disk path="$storage_path/$virt_node/$virt_node-d2.img,format=$storage_format,size=$d2,bus=$bus,io=native,cache=directsync" \
--disk path="$storage_path/$virt_node/$virt_node-d3.img,format=$storage_format,size=$d3,bus=$bus,io=native,cache=directsync" \
--network=network=$network,mac="$macaddr1",model=$nic_model \
--network=network=$network,mac="$macaddr2",model=$nic_model > "$virt_node.xml"
virsh define "$virt_node.xml"