From: Matt Birkholz Date: Sat, 22 Nov 2025 20:55:12 +0000 (-0700) Subject: Set missing membership-rolls target. X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=8a537ea5c26ba1cc867c979202d31be470389dbd;p=Institute.git Set missing membership-rolls target. --- diff --git a/README.org b/README.org index b3e67ea..b7c3ee1 100644 --- a/README.org +++ b/README.org @@ -769,6 +769,7 @@ with ~address-vars~ in the =default/main.yml= files. #+NAME: address-vars #+CAPTION: ~address-vars~ #+BEGIN_SRC conf + core_addr_cidr: "{{ private_net_cidr | ansible.utils.ipaddr('1') }}" gate_addr_cidr: "{{ private_net_cidr | ansible.utils.ipaddr('2') }}" gate_wild_addr_cidr: @@ -6207,8 +6208,10 @@ creates the first member. Until then, Ansible includes the =members.yml= first and =members-empty.yml= last. That list is the value of ~membership_rolls~. +#+NAME: membership-rolls #+CAPTION: ~membership-rolls~ #+BEGIN_SRC conf + membership_rolls: - "../private/members.yml" - "../private/members-empty.yml" diff --git a/roles_t/campus/defaults/main.yml b/roles_t/campus/defaults/main.yml index 93a1113..6cf00ab 100644 --- a/roles_t/campus/defaults/main.yml +++ b/roles_t/campus/defaults/main.yml @@ -22,6 +22,7 @@ campus_wg_net_mask: "{{ campus_wg_net_cidr | ansible.utils.ipaddr('netmask') }}" campus_wg_net_and_mask: "{{ campus_wg_net }} {{ campus_wg_net_mask }}" + core_addr_cidr: "{{ private_net_cidr | ansible.utils.ipaddr('1') }}" gate_addr_cidr: "{{ private_net_cidr | ansible.utils.ipaddr('2') }}" gate_wild_addr_cidr: diff --git a/roles_t/check-inst-vars/defaults/main.yml b/roles_t/check-inst-vars/defaults/main.yml index 93a1113..6cf00ab 100644 --- a/roles_t/check-inst-vars/defaults/main.yml +++ b/roles_t/check-inst-vars/defaults/main.yml @@ -22,6 +22,7 @@ campus_wg_net_mask: "{{ campus_wg_net_cidr | ansible.utils.ipaddr('netmask') }}" campus_wg_net_and_mask: "{{ campus_wg_net }} {{ campus_wg_net_mask }}" + core_addr_cidr: "{{ private_net_cidr | ansible.utils.ipaddr('1') }}" gate_addr_cidr: "{{ private_net_cidr | ansible.utils.ipaddr('2') }}" gate_wild_addr_cidr: diff --git a/roles_t/core/defaults/main.yml b/roles_t/core/defaults/main.yml index 93a1113..d6017d7 100644 --- a/roles_t/core/defaults/main.yml +++ b/roles_t/core/defaults/main.yml @@ -22,6 +22,7 @@ campus_wg_net_mask: "{{ campus_wg_net_cidr | ansible.utils.ipaddr('netmask') }}" campus_wg_net_and_mask: "{{ campus_wg_net }} {{ campus_wg_net_mask }}" + core_addr_cidr: "{{ private_net_cidr | ansible.utils.ipaddr('1') }}" gate_addr_cidr: "{{ private_net_cidr | ansible.utils.ipaddr('2') }}" gate_wild_addr_cidr: @@ -39,3 +40,7 @@ front_wg_addr: "{{ front_wg_addr_cidr | ansible.utils.ipaddr('address') }}" core_wg_addr: "{{ core_wg_addr_cidr | ansible.utils.ipaddr('address') }}" + +membership_rolls: +- "../private/members.yml" +- "../private/members-empty.yml" diff --git a/roles_t/front/defaults/main.yml b/roles_t/front/defaults/main.yml index 93a1113..d6017d7 100644 --- a/roles_t/front/defaults/main.yml +++ b/roles_t/front/defaults/main.yml @@ -22,6 +22,7 @@ campus_wg_net_mask: "{{ campus_wg_net_cidr | ansible.utils.ipaddr('netmask') }}" campus_wg_net_and_mask: "{{ campus_wg_net }} {{ campus_wg_net_mask }}" + core_addr_cidr: "{{ private_net_cidr | ansible.utils.ipaddr('1') }}" gate_addr_cidr: "{{ private_net_cidr | ansible.utils.ipaddr('2') }}" gate_wild_addr_cidr: @@ -39,3 +40,7 @@ front_wg_addr: "{{ front_wg_addr_cidr | ansible.utils.ipaddr('address') }}" core_wg_addr: "{{ core_wg_addr_cidr | ansible.utils.ipaddr('address') }}" + +membership_rolls: +- "../private/members.yml" +- "../private/members-empty.yml" diff --git a/roles_t/gate/defaults/main.yml b/roles_t/gate/defaults/main.yml index 93a1113..6cf00ab 100644 --- a/roles_t/gate/defaults/main.yml +++ b/roles_t/gate/defaults/main.yml @@ -22,6 +22,7 @@ campus_wg_net_mask: "{{ campus_wg_net_cidr | ansible.utils.ipaddr('netmask') }}" campus_wg_net_and_mask: "{{ campus_wg_net }} {{ campus_wg_net_mask }}" + core_addr_cidr: "{{ private_net_cidr | ansible.utils.ipaddr('1') }}" gate_addr_cidr: "{{ private_net_cidr | ansible.utils.ipaddr('2') }}" gate_wild_addr_cidr: diff --git a/roles_t/gate/tasks/main.yml b/roles_t/gate/tasks/main.yml index 6f12701..af902b5 100644 --- a/roles_t/gate/tasks/main.yml +++ b/roles_t/gate/tasks/main.yml @@ -2,6 +2,7 @@ - name: Include public variables. include_vars: ../public/vars.yml tags: accounts + - name: Include private variables. include_vars: ../private/vars.yml tags: accounts