Move lxd configuration files to lxd folder
Change-Id: Ibe14aadec9b8befe2f2f843a4d3f8794ff227b8b
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh
index 1e406dd..21f522d 100755
--- a/installers/charmed_install.sh
+++ b/installers/charmed_install.sh
@@ -178,7 +178,7 @@
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 @@
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 960531d..60cf91e 100755
--- a/installers/install_lxd.sh
+++ b/installers/install_lxd.sh
@@ -37,7 +37,7 @@
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 @@
# 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