From 8b5d03935a661e80caf353fdff8b8b998d702e27 Mon Sep 17 00:00:00 2001 From: Lucas Di Pentima Date: Thu, 14 Mar 2024 17:54:02 -0300 Subject: [PATCH] 21165: Uninstalls WB1 from single host installations too. Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima --- .../states/workbench1_uninstall.sls | 12 ++++++++++++ .../single_hostname/states/workbench1_uninstall.sls | 12 ++++++++++++ tools/salt-install/provision.sh | 1 + 3 files changed, 25 insertions(+) create mode 100644 tools/salt-install/config_examples/single_host/multiple_hostnames/states/workbench1_uninstall.sls create mode 100644 tools/salt-install/config_examples/single_host/single_hostname/states/workbench1_uninstall.sls diff --git a/tools/salt-install/config_examples/single_host/multiple_hostnames/states/workbench1_uninstall.sls b/tools/salt-install/config_examples/single_host/multiple_hostnames/states/workbench1_uninstall.sls new file mode 100644 index 0000000000..02ac0af640 --- /dev/null +++ b/tools/salt-install/config_examples/single_host/multiple_hostnames/states/workbench1_uninstall.sls @@ -0,0 +1,12 @@ +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: Apache-2.0 + +{%- set curr_tpldir = tpldir %} +{%- set tpldir = 'arvados' %} +{%- from "arvados/map.jinja" import arvados with context %} +{%- set tpldir = curr_tpldir %} + +workbench1_pkg_removed: + pkg.removed: + - name: {{ arvados.workbench.pkg.name }} \ No newline at end of file diff --git a/tools/salt-install/config_examples/single_host/single_hostname/states/workbench1_uninstall.sls b/tools/salt-install/config_examples/single_host/single_hostname/states/workbench1_uninstall.sls new file mode 100644 index 0000000000..02ac0af640 --- /dev/null +++ b/tools/salt-install/config_examples/single_host/single_hostname/states/workbench1_uninstall.sls @@ -0,0 +1,12 @@ +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: Apache-2.0 + +{%- set curr_tpldir = tpldir %} +{%- set tpldir = 'arvados' %} +{%- from "arvados/map.jinja" import arvados with context %} +{%- set tpldir = curr_tpldir %} + +workbench1_pkg_removed: + pkg.removed: + - name: {{ arvados.workbench.pkg.name }} \ No newline at end of file diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh index 1c3a37fd53..8dd07020c3 100755 --- a/tools/salt-install/provision.sh +++ b/tools/salt-install/provision.sh @@ -615,6 +615,7 @@ if [ -z "${ROLES:-}" ]; then echo " - extra.shell_sudo_passwordless" >> ${STATES_TOP} echo " - extra.shell_cron_add_login_sync" >> ${STATES_TOP} echo " - extra.passenger_rvm" >> ${STATES_TOP} + echo " - extra.workbench1_uninstall" >> ${STATES_TOP} # Pillars echo " - docker" >> ${PILLARS_TOP} -- 2.30.2