From 589a3676e896624e2994236ac631d83ee65a9cd5 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Thu, 27 Mar 2025 09:57:53 +0100 Subject: [PATCH] Move lxd configuration files to lxd folder Change-Id: Ibe14aadec9b8befe2f2f843a4d3f8794ff227b8b Signed-off-by: garciadeblas --- installers/charmed_install.sh | 4 ++-- installers/install_lxd.sh | 4 ++-- installers/{ => lxd}/60-lxd-production.conf | 0 installers/{ => lxd}/lxd-preseed.conf | 0 4 files changed, 4 insertions(+), 4 deletions(-) rename installers/{ => lxd}/60-lxd-production.conf (100%) rename installers/{ => lxd}/lxd-preseed.conf (100%) diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh index 1e406ddb..21f522df 100755 --- a/installers/charmed_install.sh +++ b/installers/charmed_install.sh @@ -178,7 +178,7 @@ EOF LXD_CLOUD=~/.osm/lxd-cloud.yaml LXD_CREDENTIALS=~/.osm/lxd-credentials.yaml # Apply sysctl production values for optimal performance - sudo cp /usr/share/osm-devops/installers/60-lxd-production.conf /etc/sysctl.d/60-lxd-production.conf + sudo cp /usr/share/osm-devops/installers/lxd/60-lxd-production.conf /etc/sysctl.d/60-lxd-production.conf sudo sysctl --system # Install LXD snap sudo apt-get remove --purge -y liblxc1 lxc-common lxcfs lxd lxd-client @@ -190,7 +190,7 @@ EOF fi # Configure LXD 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" + cat /usr/share/osm-devops/installers/lxd/lxd-preseed.conf | sed 's/^config: {}/config:\n core.https_address: '$LXDENDPOINT':8443/' | sg lxd -c "lxd init --preseed" sg lxd -c "lxd waitready" cat << EOF > $LXD_CLOUD diff --git a/installers/install_lxd.sh b/installers/install_lxd.sh index 960531de..60cf91eb 100755 --- a/installers/install_lxd.sh +++ b/installers/install_lxd.sh @@ -37,7 +37,7 @@ function usage(){ function install_lxd() { [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function # Apply sysctl production values for optimal performance - sudo cp ${OSM_DEVOPS}/installers/60-lxd-production.conf /etc/sysctl.d/60-lxd-production.conf + sudo cp ${OSM_DEVOPS}/installers/lxd/60-lxd-production.conf /etc/sysctl.d/60-lxd-production.conf sudo sysctl --system # Install LXD snap @@ -61,7 +61,7 @@ function install_lxd() { # Configure 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" + cat ${OSM_DEVOPS}/installers/lxd/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" # Configure LXD to work behind a proxy diff --git a/installers/60-lxd-production.conf b/installers/lxd/60-lxd-production.conf similarity index 100% rename from installers/60-lxd-production.conf rename to installers/lxd/60-lxd-production.conf diff --git a/installers/lxd-preseed.conf b/installers/lxd/lxd-preseed.conf similarity index 100% rename from installers/lxd-preseed.conf rename to installers/lxd/lxd-preseed.conf -- 2.25.1