commit 714b79513f6ece1556088ed5fbb2b281da92b8e9 parent ada65b497e3cd90b48bb52216a04f1c9802bcdcc Author: Florian Dold <florian@dold.me> Date: Mon, 24 Feb 2025 00:19:31 +0100 reorg inventory Diffstat:
9 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/deploy.sh b/deploy.sh @@ -3,16 +3,14 @@ set -eu if [ -z ${1:-} ] then - echo "Call with 'test' or 'tops' to select which secrets to use" + echo "Call with 'tops' or another host/group to select target" exit 1 fi ansible-playbook \ -vv \ - --inventory inventories/tops \ - --user root \ - playbooks/setup.yml \ - --extra-vars "@playbooks/$1-secrets.yml" \ - --extra-vars "@playbooks/$1-public.yml" + --inventory inventories/default \ + --limit "$1" \ + playbooks/setup.yml exit 0 diff --git a/inventories/default b/inventories/default @@ -0,0 +1,6 @@ +[testing] +fdold-acai ansible_port=22 ansible_user=root ansible_host=188.245.187.147 +rusty.taler-ops.ch ansible_port=22 ansible_user=root + +[production] +spec.taler-ops.ch ansible_port=22 ansible_user=root diff --git a/inventories/example b/inventories/example @@ -1,2 +0,0 @@ -[staging] -172.18.103.122 ansible_port=22 ansible_user=root ansible_ssh_private_key_file=~/.ssh/taler_ansible_id_ed25519 diff --git a/inventories/fdold-acai b/inventories/fdold-acai @@ -1 +0,0 @@ -fdold-acai ansible_port=22 ansible_user=root ansible_host=188.245.187.147 diff --git a/playbooks/test-public.yml b/inventories/host_vars/rusty.taler-ops.ch/test-public.yml diff --git a/playbooks/test-secrets.yml b/inventories/host_vars/rusty.taler-ops.ch/test-secrets.yml diff --git a/playbooks/tops-public.yml b/inventories/host_vars/spec.taler-ops.ch/tops-public.yml diff --git a/playbooks/tops-secrets.yml.gpg b/inventories/host_vars/spec.taler-ops.ch/tops-secrets.yml.gpg Binary files differ. diff --git a/inventories/tops b/inventories/tops @@ -1,2 +0,0 @@ -[production] -spec.taler-ops.ch ansible_port=22 ansible_user=root