fixups

lmiccini · May 2, 2024 · 079c9f3 · 079c9f3
1 parent 9922724
commit 079c9f3
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 47 deletions.
diff --git a/examples/va/pidone/control-plane/nncp/values.yaml b/examples/va/pidone/control-plane/nncp/values.yaml
@@ -123,16 +123,6 @@ data:
           "range_end": "172.18.0.70"
         }
       }
-  storagemgmt:  # used on RHEL, not used on OpenShift
-    dnsDomain: storagemgmt.example.com
-    subnets:
-      - allocationRanges:
-          - end: 172.20.0.250
-            start: 172.20.0.100
-        cidr: 172.20.0.0/24
-        name: subnet1
-        vlan: 23
-    mtu: 9000
   tenant:
     dnsDomain: tenant.example.com
     subnets:

diff --git a/examples/va/pidone/kustomization.yaml b/examples/va/pidone/kustomization.yaml
@@ -7,3 +7,4 @@ components:
 
 resources:
   - values.yaml
+  - service-values.yaml  
diff --git a/examples/va/pidone/values.yaml b/examples/va/pidone/values.yaml
@@ -63,11 +63,6 @@ data:
                 service_net_map:
                     nova_api_network: internalapi
                     nova_libvirt_network: internalapi
-                storage_mgmt_cidr: '24'
-                storage_mgmt_host_routes: []
-                storage_mgmt_mtu: 9000
-                storage_mgmt_vlan_id: 23
-                storage_mtu: 9000
                 timesync_ntp_servers:
                 -   hostname: pool.ntp.org
         networks:
@@ -80,8 +75,6 @@ data:
             subnetName: subnet1
         -   name: tenant
             subnetName: subnet1
-        -   name: storagemgmt
-            subnetName: subnet1
         nodes:
             edpm-compute-0:
                 ansible:
@@ -96,8 +89,6 @@ data:
                     subnetName: subnet1
                 -   name: storage
                     subnetName: subnet1
-                -   name: storagemgmt
-                    subnetName: subnet1
                 -   name: tenant
                     subnetName: subnet1
             edpm-compute-1:
@@ -113,8 +104,6 @@ data:
                     subnetName: subnet1
                 -   name: storage
                     subnetName: subnet1
-                -   name: storagemgmt
-                    subnetName: subnet1
                 -   name: tenant
                     subnetName: subnet1
             edpm-compute-2:
@@ -130,8 +119,6 @@ data:
                     subnetName: subnet1
                 -   name: storage
                     subnetName: subnet1
-                -   name: storagemgmt
-                    subnetName: subnet1
                 -   name: tenant
                     subnetName: subnet1
         services:

diff --git a/va/pidone/kustomization.yaml b/va/pidone/kustomization.yaml
@@ -24,30 +24,6 @@ components:
   - ../../lib/control-plane
 
 replacements:
-  ## Control plane customization
-  #- source:
-  #    kind: ConfigMap
-  #    name: service-values
-  #    fieldPath: data.neutron.customServiceConfig
-  #  targets:
-  #    - select:
-  #        kind: OpenStackControlPlane
-  #      fieldPaths:
-  #        - spec.neutron.template.customServiceConfig
-  #      options:
-  #        create: true
-  ## OVN control plane SRIOV customization
-  #- source:
-  #    kind: ConfigMap
-  #    name: service-values
-  #    fieldPath: data.ovn.ovnController.nicMappings
-  #  targets:
-  #    - select:
-  #        kind: OpenStackControlPlane
-  #      fieldPaths:
-  #        - spec.ovn.template.ovnController.nicMappings
-  #      options:
-  #        create: true
   - source:
       kind: ConfigMap
       name: service-values
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,3 +7,4 @@ components:

		resources:
		- values.yaml
		- service-values.yaml