From: Mark Beierl Date: Wed, 21 Jun 2023 18:35:03 +0000 (-0400) Subject: Fixes Bug 2224 X-Git-Tag: release-v14.0-start~12 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F65%2F13565%2F3;p=osm%2Fdevops.git Fixes Bug 2224 Minor changes to the LXD preseed were required as part of the update to LXD 5.0 Change-Id: I6741e74b811f8435b4e74a9587c93d3c4d368dab Signed-off-by: Mark Beierl --- diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh index 7b0c48f8..0b8c7cc7 100755 --- a/installers/charmed_install.sh +++ b/installers/charmed_install.sh @@ -187,9 +187,6 @@ EOF sudo usermod -a -G lxd `whoami` cat /usr/share/osm-devops/installers/lxd-preseed.conf | sed 's/^config: {}/config:\n core.https_address: '$LXDENDPOINT':8443/' | sg lxd -c "lxd init --preseed" sg lxd -c "lxd waitready" - DEFAULT_MTU=$(ip addr show $DEFAULT_IF | perl -ne 'if (/mtu\s(\d+)/) {print $1;}') - sg lxd -c "lxc profile device set default eth0 mtu $DEFAULT_MTU" - sg lxd -c "lxc network set lxdbr0 bridge.mtu $DEFAULT_MTU" cat << EOF > $LXD_CLOUD clouds: diff --git a/installers/install_lxd.sh b/installers/install_lxd.sh index 0bf6d237..960531de 100755 --- a/installers/install_lxd.sh +++ b/installers/install_lxd.sh @@ -63,12 +63,6 @@ function install_lxd() { sudo usermod -a -G lxd `whoami` cat ${OSM_DEVOPS}/installers/lxd-preseed.conf | sed 's/^config: {}/config:\n core.https_address: '$OSM_DEFAULT_IP':8443/' | sg lxd -c "lxd init --preseed" sg lxd -c "lxd waitready" - sg lxd -c "lxc profile device set default eth0 mtu $DEFAULT_MTU" - sg lxd -c "lxc network set lxdbr0 bridge.mtu $DEFAULT_MTU" - # sudo systemctl stop lxd-bridge - # sudo systemctl --system daemon-reload - # sudo systemctl enable lxd-bridge - # sudo systemctl start lxd-bridge # Configure LXD to work behind a proxy if [ -n "${OSM_BEHIND_PROXY}" ] ; then diff --git a/installers/lxd-preseed.conf b/installers/lxd-preseed.conf index 15a9594d..d4d1cb43 100644 --- a/installers/lxd-preseed.conf +++ b/installers/lxd-preseed.conf @@ -18,12 +18,12 @@ networks: ipv4.address: auto ipv6.address: none description: "" - managed: false name: lxdbr0 type: "" + project: default storage_pools: - config: - size: 100GB + size: 100GiB description: "" name: default driver: btrfs @@ -33,12 +33,12 @@ profiles: devices: eth0: name: eth0 - nictype: bridged - parent: lxdbr0 + network: lxdbr0 type: nic root: path: / pool: default type: disk name: default -cluster: null +projects: [] +cluster: null \ No newline at end of file