Merge "Remove unused networks from OpenShift roles" into stable/rocky

4 years ago · 9e2afdb747
parent 1b3c68c4a2 aa0e0d3c43
commit 9e2afdb747
4 changed files with 0 additions and 8 deletions
--- a/roles/OpenShiftAllInOne.yaml
+++ b/roles/OpenShiftAllInOne.yaml
@ -15,8 +15,6 @@
    - External
    - InternalApi
    - Storage
-    - StorageMgmt
-    - Tenant
  # For systems with both IPv4 and IPv6, you may specify a gateway network for
  # each, such as ['ControlPlane', 'External']
  default_route_networks: ['External']
--- a/roles/OpenShiftInfra.yaml
+++ b/roles/OpenShiftInfra.yaml
@ -12,8 +12,6 @@
  networks:
    - InternalApi
    - Storage
-    - StorageMgmt
-    - Tenant
  # For systems with both IPv4 and IPv6, you may specify a gateway network for
  # each, such as ['ControlPlane', 'External']
  default_route_networks: ['ControlPlane']
--- a/roles/OpenShiftMaster.yaml
+++ b/roles/OpenShiftMaster.yaml
@ -15,8 +15,6 @@
    - External
    - InternalApi
    - Storage
-    - StorageMgmt
-    - Tenant
  # For systems with both IPv4 and IPv6, you may specify a gateway network for
  # each, such as ['ControlPlane', 'External']
  default_route_networks: ['External']
--- a/roles/OpenShiftWorker.yaml
+++ b/roles/OpenShiftWorker.yaml
@ -12,8 +12,6 @@
  networks:
    - InternalApi
    - Storage
-    - StorageMgmt
-    - Tenant
  # For systems with both IPv4 and IPv6, you may specify a gateway network for
  # each, such as ['ControlPlane', 'External']
  default_route_networks: ['ControlPlane']