A few updates
* Give capability to tag or not * fix -d option * Update hp01 config
This commit is contained in:
parent
7e36aa1432
commit
5d837ae9ff
@ -8,6 +8,11 @@ external_ip=192.168.1.200
|
||||
|
||||
compute="hp1-maas-node"
|
||||
|
||||
juju_count=0
|
||||
control_count=0
|
||||
|
||||
enable_tagging=false
|
||||
|
||||
bridges=()
|
||||
bridges+=("br0")
|
||||
bridges+=("br1")
|
||||
|
@ -12,6 +12,8 @@ maas_system_ip="192.168.1.22"
|
||||
maas_upstream_dns="192.168.1.13"
|
||||
maas_user="admin"
|
||||
maas_version="2.9"
|
||||
#no_proxy="localhost,127.0.0.1,$maas_system_ip"
|
||||
#squid_proxy="http://192.168.1.23:3128"
|
||||
maas_pkg_type="snap"
|
||||
maas_api_key="BLeLFyaDHeEHMfVzpB:HK9E2XkwUud8T2FFPz:3SxCCMrdRXAENnKqPrK7AXg6NjgtM8w6"
|
||||
maas_subnet_start="10.0.1.1"
|
||||
|
@ -48,6 +48,8 @@ machine_add_tag()
|
||||
system_id=$1
|
||||
tag=$2
|
||||
|
||||
[[ -n "$enable_tagging" ]] && [[ $enable_tagging == "false" ]] && return
|
||||
|
||||
# If the tag doesn't exist, then create it
|
||||
if [[ $(maas ${maas_profile} tag read ${tag}) == "Not Found" ]] ; then
|
||||
case $tag in
|
||||
|
@ -309,10 +309,10 @@ build_vms() {
|
||||
# For testing and WIP/POC
|
||||
if [[ ${enable_secureboot} == "true" ]] ; then
|
||||
extra_args+=" --boot loader_secure=yes"
|
||||
#extra_args+=" --boot loader=/usr/share/OVMF/OVMF_CODE.secboot.fd"
|
||||
#extra_args+=" --boot nvram_template=/usr/share/OVMF/OVMF_VARS.fd"
|
||||
#extra_args+=" --boot loader_ro=yes"
|
||||
#extra_args+=" --boot loader_type=pflash"
|
||||
#extra_args+=",loader=/usr/share/OVMF/OVMF_CODE.secboot.fd"
|
||||
#extra_args+=",nvram_template=/usr/share/OVMF/OVMF_VARS.fd"
|
||||
#extra_args+=",loader_ro=yes"
|
||||
#extra_args+=",loader_type=pflash"
|
||||
extra_args+=" --machine q35"
|
||||
extra_args+=" --features smm=on"
|
||||
enable_uefi="true"
|
||||
@ -422,6 +422,8 @@ while getopts ":cwjdnr" opt; do
|
||||
wipe_vms
|
||||
;;
|
||||
d)
|
||||
install_deps
|
||||
maas_login
|
||||
wipe_disks
|
||||
;;
|
||||
n)
|
||||
|
Loading…
x
Reference in New Issue
Block a user