Skip to content

Commit 7e07c41

Browse files
committed
base caas repo root off environment root
1 parent 2ba7815 commit 7e07c41

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

environments/.caas/hooks/pre.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
---
22

3+
- hosts: all
4+
become: no
5+
gather_facts: no
6+
tasks:
7+
- debug:
8+
msg: |
9+
appliances_environment_root: {{ appliances_environment_root }}
10+
appliances_repository_root: {{ appliances_repository_root }}
11+
- meta: end_here
12+
313
# Provision the infrastructure using Terraform
414
- name: Provision infrastructure
515
hosts: openstack

environments/.caas/inventory/group_vars/all/cluster.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Account for the fact we are running outside of the expected environment system:
2-
# NB: this only works for playbooks in ansible/*, not in ansible/adhoc!
3-
appliances_repository_root: "{{ playbook_dir }}/../"
2+
appliances_repository_root: "{{ appliances_environment_root + '/../../' | normpath }}"
43

54
# Read the secrets from the Ansible local facts on the control host
65
vault_azimuth_user_password: "{{ hostvars[groups['control'][0]].ansible_local.openhpc_secrets.vault_azimuth_user_password }}"

0 commit comments

Comments
 (0)