From baf221bfa70105b3501751ac0e6f42f4b9900b10 Mon Sep 17 00:00:00 2001 From: Ward Vandewege Date: Tue, 1 Mar 2022 09:27:50 -0500 Subject: [PATCH] 18785: make sure that dnsmasq is present, and make sure that our customized /etc/hosts survives a reboot. Arvados-DCO-1.1-Signed-off-by: Ward Vandewege --- .../single_host/multiple_hostnames/states/dns.sls | 8 ++++++++ .../single_host/single_hostname/states/dns.sls | 8 ++++++++ tools/salt-install/provision.sh | 4 ++++ 3 files changed, 20 insertions(+) create mode 100644 tools/salt-install/config_examples/single_host/multiple_hostnames/states/dns.sls create mode 100644 tools/salt-install/config_examples/single_host/single_hostname/states/dns.sls diff --git a/tools/salt-install/config_examples/single_host/multiple_hostnames/states/dns.sls b/tools/salt-install/config_examples/single_host/multiple_hostnames/states/dns.sls new file mode 100644 index 0000000000..f298e8f66d --- /dev/null +++ b/tools/salt-install/config_examples/single_host/multiple_hostnames/states/dns.sls @@ -0,0 +1,8 @@ +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: AGPL-3.0 + +dns: + pkg.installed: + - pkgs: + - dnsmasq diff --git a/tools/salt-install/config_examples/single_host/single_hostname/states/dns.sls b/tools/salt-install/config_examples/single_host/single_hostname/states/dns.sls new file mode 100644 index 0000000000..f298e8f66d --- /dev/null +++ b/tools/salt-install/config_examples/single_host/single_hostname/states/dns.sls @@ -0,0 +1,8 @@ +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: AGPL-3.0 + +dns: + pkg.installed: + - pkgs: + - dnsmasq diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh index fd88d97a94..204044d907 100755 --- a/tools/salt-install/provision.sh +++ b/tools/salt-install/provision.sh @@ -775,6 +775,10 @@ echo '\pset pager off' >> /root/.psqlrc # Now run the install salt-call --local state.apply -l ${LOG_LEVEL} +# Finally, make sure that /etc/hosts is not overwritten on reboot +# TODO: will this work on CentOS? +sed -i 's/^manage_etc_hosts: true/#manage_etc_hosts: true/g' /etc/cloud/cloud.cfg.d/* + # FIXME! #16992 Temporary fix for psql call in arvados-api-server if [ "x${DELETE_PSQL}" = "xyes" ]; then echo "Removing .psql file" -- 2.30.2