From 0cb596f4dbcbc38f3f5b6ea338a7b6ce27bfc3879be4d3d8ee476065988fc9d2 Mon Sep 17 00:00:00 2001 From: bryan Date: Tue, 27 Jan 2026 01:55:54 -0500 Subject: [PATCH] Update playbook infra --- .gitignore | 3 ++- ansible.cfg | 1 + bootstrap | 7 ++++--- galaxy-requirements.yml => collections/requirements.yml | 0 deploy-vm | 2 +- deploy.code-workspace | 2 +- inventories/hosts.ini | 6 ++++-- pip-requirements => requirements | 0 8 files changed, 13 insertions(+), 8 deletions(-) rename galaxy-requirements.yml => collections/requirements.yml (100%) rename pip-requirements => requirements (100%) diff --git a/.gitignore b/.gitignore index ac07246..678eec6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .ansible -testing/ \ No newline at end of file +testing/ +vault.yml \ No newline at end of file diff --git a/ansible.cfg b/ansible.cfg index 271d404..3abaedf 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -1,2 +1,3 @@ [defaults] inventory = inventories/hosts.ini +collections_paths = ./collections \ No newline at end of file diff --git a/bootstrap b/bootstrap index 1f0632a..9776b7f 100755 --- a/bootstrap +++ b/bootstrap @@ -2,6 +2,7 @@ # Bootstrap Ansible environment # Usage: ./bootstrap [--force] -pip install --upgrade pip "$@" -pip install --upgrade --requirement pip-requirements "$@" -ansible-galaxy install --role-file galaxy-requirements.yml "$@" \ No newline at end of file +python -m ensurepip --upgrade +pip install --upgrade pip +pip install --upgrade --requirement requirements "$@" +ansible-galaxy install --role-file collections/requirements.yml "$@" \ No newline at end of file diff --git a/galaxy-requirements.yml b/collections/requirements.yml similarity index 100% rename from galaxy-requirements.yml rename to collections/requirements.yml diff --git a/deploy-vm b/deploy-vm index de89ff1..2b6ec37 100755 --- a/deploy-vm +++ b/deploy-vm @@ -2,4 +2,4 @@ # ansible-playbook playbook.yml -l testing-remote --ask-vault-pass --ask-become-pass --check --diff -ansible-playbook playbook.yml -l testing-remote --ask-vault-pass --ask-become-pass --diff "$@" +ansible-playbook playbook.yml -l workstation-remote-testing --ask-vault-pass --ask-become-pass --diff "$@" diff --git a/deploy.code-workspace b/deploy.code-workspace index 075ff83..173b0fe 100644 --- a/deploy.code-workspace +++ b/deploy.code-workspace @@ -5,7 +5,7 @@ } ], "settings": { - "ansible.python.interpreterPath": "/home/bryan/.virtualenvs/deploy/bin/python", + "ansible.python.interpreterPath": "/home/bryan/develop/deploy/.venv/bin/python", "search.followSymlinks": false, }, diff --git a/inventories/hosts.ini b/inventories/hosts.ini index 0760962..f081cdc 100644 --- a/inventories/hosts.ini +++ b/inventories/hosts.ini @@ -5,16 +5,18 @@ htpc-remote ansible_host=htpc ansible_user=bryan [workstation] workstation-local ansible_connection=local ansible_user=bryan workstation-remote ansible_host=workstation ansible_user=bryan +workstation-remote-testing ansible_host=vm-fedora43 ansible_user=bryan [laptop] laptop-local ansible_connection=local ansible_user=bryan laptop-remote ansible_host=laptop ansible_user=bryan +laptop-remote-testing ansible_host=192.168.122.95 ansible_user=bryan [server] bryanroessler.com ansible_host=bryanroessler.com ansible_user=bryan -[testing] -testing-remote ansible_host=192.168.122.205 ansible_user=bryan +# [testing] +# testing-remote ansible_host=192.168.122.205 ansible_user=bryan # [desktops:children] # workstation diff --git a/pip-requirements b/requirements similarity index 100% rename from pip-requirements rename to requirements