Merge branch 'master' of https://github.com/metal-stack/metal-roles i…

…nto ipam-grpc-server
metal-stack · Jun 12, 2024 · f29e1ad · f29e1ad
2 parents a663894 + baeb80b
commit f29e1ad
Show file tree

Hide file tree

Showing 31 changed files with 730 additions and 416 deletions.
diff --git a/partition/README.md b/partition/README.md
@@ -38,11 +38,9 @@ You can look up all the default values [here](partition-defaults/main.yaml).
 | [dhcp-relay](roles/dhcp-relay)               | Deploys a dhcp-relay                        |
 | [docker-on-cumulus](roles/docker-on-cumulus) | Deploys docker on cumulus                   |
 | [metal-bmc](roles/metal-bmc)                 | Deploys metal-bmc                           |
-| [leaf](roles/leaf)                           | Deploys network config for cumulus switches |
 | [metal-core](roles/metal-core)               | Deploys metal-core                          |
 | [pixiecore](roles/pixiecore)                 | Deploys pixiecore                           |
 | [promtail](roles/promtail)                   | Deploys promtail                            |
-| [router](roles/router)                       | Deploys router config on cumulus switches   |
 
 ## Examples
 

diff --git a/partition/roles/leaf/files/bridgemac.json b/partition/roles/leaf/files/bridgemac.json
diff --git a/partition/roles/leaf/handlers/main.yaml b/partition/roles/leaf/handlers/main.yaml
diff --git a/partition/roles/leaf/tasks/main.yaml b/partition/roles/leaf/tasks/main.yaml
diff --git a/partition/roles/leaf/templates/bak/frr.conf.j2.bak b/partition/roles/leaf/templates/bak/frr.conf.j2.bak
diff --git a/partition/roles/leaf/templates/bak/interfaces.j2.bak b/partition/roles/leaf/templates/bak/interfaces.j2.bak
diff --git a/partition/roles/leaf/templates/frr.conf.j2 b/partition/roles/leaf/templates/frr.conf.j2
diff --git a/partition/roles/leaf/templates/interfaces.j2 b/partition/roles/leaf/templates/interfaces.j2
diff --git a/partition/roles/router/defaults/main.yaml b/partition/roles/router/defaults/main.yaml
diff --git a/partition/roles/router/files/99control_plane_catch_all.rules b/partition/roles/router/files/99control_plane_catch_all.rules
diff --git a/partition/roles/router/files/daemons b/partition/roles/router/files/daemons
diff --git a/partition/roles/router/files/frr-validation@.service b/partition/roles/router/files/frr-validation@.service
diff --git a/partition/roles/router/files/ifreload.service b/partition/roles/router/files/ifreload.service
diff --git a/partition/roles/router/files/interfaces-validation@.service b/partition/roles/router/files/interfaces-validation@.service
diff --git a/partition/roles/router/files/lldpd.d/portsubtype.conf b/partition/roles/router/files/lldpd.d/portsubtype.conf
diff --git a/partition/roles/router/files/lldpd.d/tx-interval.conf b/partition/roles/router/files/lldpd.d/tx-interval.conf
diff --git a/partition/roles/router/handlers/main.yaml b/partition/roles/router/handlers/main.yaml
diff --git a/partition/roles/router/tasks/main.yaml b/partition/roles/router/tasks/main.yaml