diff --git a/devserver/ansible/inventory.yaml b/devserver/ansible/inventory.yaml index 72fadac..14c1562 100644 --- a/devserver/ansible/inventory.yaml +++ b/devserver/ansible/inventory.yaml @@ -1,11 +1,5 @@ --- # Static inventory for the devICT dev server. -# -# The `ansible_host` value can be populated from Terraform output: -# ansible_host: $(cd ../terraform && terraform output -raw droplet_ipv4) -# -# Or run with an override: -# ansible-playbook -i 'devict-devserver,$(terraform output -raw droplet_ipv4),' playbook.yaml all: vars: @@ -14,5 +8,5 @@ all: devserver: hosts: devict-devserver: - # TODO: set ansible_host to the droplet IP, e.g. ansible_host: 203.0.113.10 - ansible_host: "{{ lookup('env', 'DEVSERVER_IP') }}" + # Resolve the droplet IP from terraform output + ansible_host: "{{ lookup('pipe', 'cd ' ~ inventory_dir ~ '/../terraform && terraform output -raw droplet_ipv4') }}" diff --git a/devserver/ansible/playbook.yaml b/devserver/ansible/playbook.yaml index 871e635..8dfca67 100644 --- a/devserver/ansible/playbook.yaml +++ b/devserver/ansible/playbook.yaml @@ -6,4 +6,4 @@ - common - docker - infisical - # - services # TODO: uncomment once services//compose.yaml is wired up + - svc-events diff --git a/devserver/terraform/outputs.tf b/devserver/terraform/outputs.tf index 6dce5e5..1b876d6 100644 --- a/devserver/terraform/outputs.tf +++ b/devserver/terraform/outputs.tf @@ -4,6 +4,6 @@ output "droplet_id" { } output "droplet_ipv4" { - description = "Public IPv4 address of the dev server. Use this for Ansible inventory: env var DEVSERVER_IP." + description = "Public IPv4 address of the dev server. Pulled in by ansible" value = digitalocean_droplet.devserver.ipv4_address }