ENH: require manually providing the doas password

pcdshub · Mar 8, 2024 · a2e292f · a2e292f
1 parent f71a06a
commit a2e292f
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 6 deletions.
diff --git a/group_vars/tcbsd_plcs/vars.yml b/group_vars/tcbsd_plcs/vars.yml
@@ -2,7 +2,6 @@
 ansible_user: Administrator
 ansible_become: true
 ansible_become_method: doas
-ansible_become_password: 1  # TODO: vault
 ansible_python_interpreter: /usr/local/bin/python3
 
 # FreeBSD packages are no longer required, beckhoff added py39-lxml again.

diff --git a/host_vars/plc-tmo-tmp-vac/vars.yml b/host_vars/plc-tmo-tmp-vac/vars.yml
@@ -6,7 +6,6 @@ tc_ams_net_id: 172.21.132.78.1.1
 #ansible_user: Administrator
 #ansible_become: true
 #ansible_become_method: doas
-#ansible_become_password: 1  # TODO: vault
 #ansible_python_interpreter: /usr/local/bin/python3
 #
 ## FreeBSD packages are no longer required, beckhoff added py39-lxml again.

diff --git a/host_vars/plc-tst-bsd1/vars.yml b/host_vars/plc-tst-bsd1/vars.yml
@@ -6,7 +6,6 @@ tc_ams_net_id: 172.21.148.81.1.1
 #ansible_user: Administrator
 #ansible_become: true
 #ansible_become_method: doas
-#ansible_become_password: 1  # TODO: vault
 #ansible_python_interpreter: /usr/local/bin/python3
 #
 ## FreeBSD packages are no longer required, beckhoff added py39-lxml again.

diff --git a/host_vars/plc-tst-bsd2/vars.yml b/host_vars/plc-tst-bsd2/vars.yml
@@ -6,7 +6,6 @@ tc_ams_net_id: 172.21.148.94.1.1
 #ansible_user: Administrator
 #ansible_become: true
 #ansible_become_method: doas
-#ansible_become_password: 1  # TODO: vault
 #ansible_python_interpreter: /usr/local/bin/python3
 #
 ## FreeBSD packages are no longer required, beckhoff added py39-lxml again.

diff --git a/scripts/bootstrap_plc.sh b/scripts/bootstrap_plc.sh
@@ -83,4 +83,4 @@ ssh -F "${SSH_CONFIG}" -i "${SSH_KEY_FILENAME}" "${USERNAME}@${HOSTNAME}" "test
 scp -F "${SSH_CONFIG}" -i "${SSH_KEY_FILENAME}" -r "${SOURCE_DIR}" "${USERNAME}@${HOSTNAME}:~/bootstrap"
 
 # Run the local install version of the bootstrap playbook
-ansible-playbook "${ANSIBLE_ROOT}/tcbsd-bootstrap-from-local-playbook.yaml" --extra-vars "target=${HOSTNAME} ansible_ssh_private_key_file=${SSH_KEY_FILENAME}" "$@"
+ansible-playbook "${ANSIBLE_ROOT}/tcbsd-bootstrap-from-local-playbook.yaml" --extra-vars "target=${HOSTNAME} ansible_ssh_private_key_file=${SSH_KEY_FILENAME}" --ask-become-pass "$@"
diff --git a/scripts/provision_plc.sh b/scripts/provision_plc.sh
@@ -29,4 +29,4 @@ if [ ! -x ansible-playbook ]; then
 fi
 
 # Run the provision playbook
-ansible-playbook "${ANSIBLE_ROOT}/tcbsd-provision-playbook.yaml" --extra-vars "target=${TARGET} ansible_ssh_private_key_file=${SSH_KEY_FILENAME}" "$@"
+ansible-playbook "${ANSIBLE_ROOT}/tcbsd-provision-playbook.yaml" --extra-vars "target=${TARGET} ansible_ssh_private_key_file=${SSH_KEY_FILENAME}" --ask-become-pass "$@"