[ARVADOS] updated: 2.3.2-43-gde8a7ced0

[Git user]

Summary of changes:
 .../config_examples/single_host/multiple_hostnames/states/dns.sls | 8 ++++----
 .../config_examples/single_host/single_hostname/states/dns.sls    | 8 ++++----
 tools/salt-install/provision.sh                                   | 4 ++++
 3 files changed, 12 insertions(+), 8 deletions(-)
 copy build/package-testing/test-package-python3-cwltest.sh => tools/salt-install/config_examples/single_host/multiple_hostnames/states/dns.sls (65%)
 mode change 100755 => 100644
 copy build/package-testing/test-package-python3-cwltest.sh => tools/salt-install/config_examples/single_host/single_hostname/states/dns.sls (65%)
 mode change 100755 => 100644

       via  de8a7ced0ac2f45c71f8fa2f419b6e8403301fcb (commit)
      from  bf81b84851b7fe2271b46655d79e73d76311c37a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit de8a7ced0ac2f45c71f8fa2f419b6e8403301fcb
Author: Ward Vandewege <ward at curii.com>
Date:   Tue Mar 1 09:27:50 2022 -0500

    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 <ward at curii.com>

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 000000000..f298e8f66
--- /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 000000000..f298e8f66
--- /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 037c22275..c4221d205 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"

-----------------------------------------------------------------------


hooks/post-receive
--