Revert "Install tgt when configuring lvm"
This reverts commit 9e8451d480ad31098cfd5794dda09e4e9e3057e1.
Installing tgt is no longer needed, as we manage it by openstack
controller.
Related-Prod: PRODX-13483
Change-Id: If9e440a8ee5ae790350c62a590003e09fcf761fd
diff --git a/de/heat-templates/scripts/instance_boot.sh b/de/heat-templates/scripts/instance_boot.sh
index 83659c1..ce7155b 100644
--- a/de/heat-templates/scripts/instance_boot.sh
+++ b/de/heat-templates/scripts/instance_boot.sh
@@ -185,24 +185,11 @@
systemctl restart atop
}
-# NOTE(vsaienko): drop when installed with cinder helm chart PRODX-13483
-function configure_tgt {
- cat <<EOF > /etc/tgt/targets.conf
-# Empty targets configuration file -- please see the package
-# documentation directory for an example.
-#
-# You can drop individual config snippets into /etc/tgt/conf.d
-include /etc/tgt/conf.d/*.conf
-include /var/lib/cinder/volumes/*
-EOF
- systemctl restart tgt
-}
-
function install_required_packages {
# Disable unattended upgrades
sed -i 's/1/0/' /etc/apt/apt.conf.d/20auto-upgrades
sed -i 's/APT::Periodic::Update-Package-Lists "1"/APT::Periodic::Update-Package-Lists "0"/g' /etc/apt/apt.conf.d/*
- local pkg_list="apt-transport-https ca-certificates curl software-properties-common jq unzip atop iptables-persistent socat ntp rng-tools open-iscsi tgt"
+ local pkg_list="apt-transport-https ca-certificates curl software-properties-common jq unzip atop iptables-persistent socat ntp rng-tools open-iscsi"
if [[ "${CONFIGURE_HUGE_PAGES}" == true ]]; then
pkg_list="$pkg_list dpdk-igb-uio-dkms"
@@ -251,8 +238,6 @@
pvcreate /dev/loop0
vgcreate nova-vol /dev/loop0
fi
-
- configure_tgt
}
function install_docker {