airship
/
promenade
Code Issues Proposed changes

Merge "Disable systemd-resolved"

This commit is contained in:
Zuul 2019-12-06 19:31:36 +00:00 committed by Gerrit Code Review
parent adc515f6ae d5afa2030c
commit d476b8a3b5
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
promenade/templates/include/up.sh
View File

@ -5,6 +5,10 @@ if [ -h /etc/resolv.conf ]; then
rm -f /etc/resolv.conf
fi
systemctl disable systemd-resolved.service
systemctl stop systemd-resolved.service
systemctl mask systemd-resolved.service
CURATED_DIRS=(
/etc/kubernetes
/var/lib/etcd
@ -101,7 +105,10 @@ done
{%- elif config['HostSystem:packages.' + role + '.required.runtime'] is defined %}
{{ config['HostSystem:packages.' + role + '.required.runtime'] }} \
{%- endif %}
{{ config['HostSystem:packages.' + role + '.required.socat'] }}; then
{%- if config['HostSystem:packages.' + role + '.required.socat'] is defined %}
{{ config['HostSystem:packages.' + role + '.required.socat'] }} \
{%- endif %}
;then
now=$(date +%s)
if [[ ${now} -gt ${end} ]]; then
log Failed to install apt packages.