Merge "Set listen-address for swarm init explicitly"
diff --git a/de/heat-templates/scripts/instance_boot.sh b/de/heat-templates/scripts/instance_boot.sh
index f65330c..a6835ac 100644
--- a/de/heat-templates/scripts/instance_boot.sh
+++ b/de/heat-templates/scripts/instance_boot.sh
@@ -153,7 +153,7 @@
function install_required_packages {
# Disable unattended upgrades
sed -i 's/1/0/' /etc/apt/apt.conf.d/20auto-upgrades
- local pkg_list="apt-transport-https ca-certificates curl software-properties-common jq unzip atop iptables-persistent socat ntp rng-tools"
+ 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"
@@ -169,6 +169,10 @@
retry 10 "Failed to install required packages" install_retry
}
+function enable_iscsi {
+ systemctl enable iscsid
+ systemctl restart iscsid
+}
function install_docker {
function install_retry {
@@ -852,6 +856,7 @@
prepare_network
prepare_docker_config
install_required_packages
+ enable_iscsi
configure_ntp
configure_atop
workaround_default_forward_policy