vars: use apartment block id for subnets

4 years ago · a6b15c0e10
parent 4866ce915c
commit a6b15c0e10
5 changed files with 9 additions and 20 deletions
--- a/group_vars/all/vars.yml
+++ b/group_vars/all/vars.yml
@ -53,6 +53,11 @@ backup_dns_servers:
 # Misc
 mtu: 1400

+subnet_ids:
+  ap: "14{{ apartment_block_id }}"
+  users_wired: "{{ apartment_block_id }}0"
+  users_wifi: "{{ apartment_block_id }}1"
+

 # Keepalived
 keepalived_password: "{{ vault_keepalived_password[apartment_block] }}"
@ -70,3 +75,7 @@ radius_secret_wired: "{{ vault_radius_secrets.wired[apartment_block] }}"

 radius_pg_replication_password: "{{ vault_re2o_db_user_passwords.replication }}"
 radius_pg_re2o_ro_password: "{{ vault_re2o_db_user_passwords.re2o_ro }}"
+
+
+
+
--- a/group_vars/edc/main.yml
+++ b/group_vars/edc/main.yml
@ -2,11 +2,6 @@
 apartment_block: edc
 apartment_block_id: 4

-subnet_ids:
-  ap: 144
-  users_wired: 40
-  users_wifi: 41
-
 router_ip_suffix: 254

 mtu: 1500
--- a/group_vars/fleming/main.yml
+++ b/group_vars/fleming/main.yml
@ -2,9 +2,4 @@
 apartment_block: fleming
 apartment_block_id: 1

-subnet_ids:
-  ap: 141
-  users_wired: 10
-  users_wifi: 11
-
 router_ip_suffix: 254
--- a/group_vars/gs/main.yml
+++ b/group_vars/gs/main.yml
@ -2,9 +2,4 @@
 apartment_block: gs
 apartment_block_id: 5

-subnet_ids:
-  ap: 145
-  users_wired: 50
-  users_wifi: 51
-
 router_ip_suffix: 240
--- a/group_vars/pacaterie/main.yml
+++ b/group_vars/pacaterie/main.yml
@ -2,11 +2,6 @@
 apartment_block: pacaterie
 apartment_block_id: 2

-subnet_ids:
-  ap: 142
-  users_wired: 20
-  users_wifi: 21
-
 router_ip_suffix: 254

 mtu: 1500