Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[delta-ipv6] Shared control plane vars #402

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
145 changes: 145 additions & 0 deletions dt/uni04delta-ipv6/control-plane/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
---
apiVersion: kustomize.config.k8s.io/v1alpha1
kind: Component

transformers:
- |-
apiVersion: builtin
kind: NamespaceTransformer
metadata:
name: _ignored_
namespace: openstack
setRoleBindingSubjects: none
unsetOnly: true
fieldSpecs:
- path: metadata/name
kind: Namespace
create: true

components:
- ../../../lib/control-plane

replacements:
- source:
kind: ConfigMap
name: service-values
fieldPath: data.neutron.customServiceConfig
targets:
- select:
kind: OpenStackControlPlane
fieldPaths:
- spec.neutron.template.customServiceConfig
options:
create: true
- source:
kind: ConfigMap
name: service-values
fieldPath: data.ironic.enabled
targets:
- select:
kind: OpenStackControlPlane
fieldPaths:
- spec.ironic.enabled
options:
create: true

- source:
kind: ConfigMap
name: service-values
fieldPath: data.ironic.rpcTransport
targets:
- select:
kind: OpenStackControlPlane
fieldPaths:
- spec.ironic.template.rpcTransport
options:
create: true

- source:
kind: ConfigMap
name: network-values
fieldPath: data.ctlplane.endpoint_annotations
targets:
- select:
kind: OpenStackControlPlane
fieldPaths:
- spec.ironic.template.ironicAPI.override.service.internal.metadata.annotations
options:
create: true

- source:
kind: ConfigMap
name: network-values
fieldPath: data.ctlplane.endpoint_annotations
targets:
- select:
kind: OpenStackControlPlane
fieldPaths:
- spec.ironic.template.ironicInspector.override.service.internal.metadata.annotations
options:
create: true

- source:
kind: ConfigMap
name: network-values
fieldPath: data.lbServiceType
targets:
- select:
kind: OpenStackControlPlane
fieldPaths:
- spec.ironic.template.ironicAPI.override.service.internal.spec.type
- spec.ironic.template.ironicInspector.override.service.internal.spec.type
options:
create: true

- source:
kind: ConfigMap
name: network-values
fieldPath: data.ironic.iface
targets:
- select:
kind: OpenStackControlPlane
fieldPaths:
- spec.ironic.template.ironicConductors.0.networkAttachments.0
- spec.ironic.template.ironicConductors.0.provisionNetwork
- spec.ironic.template.ironicInspector.inspectionNetwork
- spec.ironic.template.ironicInspector.networkAttachments.0
- spec.ovn.template.ovnController.nicMappings.ironic
options:
create: true

- source:
kind: ConfigMap
name: service-values
fieldPath: data.ironic.ironicConductors.0.customServiceConfig
targets:
- select:
kind: OpenStackControlPlane
fieldPaths:
- spec.ironic.template.ironicConductors.0.customServiceConfig
options:
create: true

- source:
kind: ConfigMap
name: service-values
fieldPath: data.ironic.ironicInspector.customServiceConfig
targets:
- select:
kind: OpenStackControlPlane
fieldPaths:
- spec.ironic.template.ironicInspector.customServiceConfig
options:
create: true

- source:
kind: ConfigMap
name: service-values
fieldPath: data.nova.cellTemplates
targets:
- select:
kind: OpenStackControlPlane
fieldPaths:
- spec.nova.template.cellTemplates
options:
create: true
2 changes: 1 addition & 1 deletion dt/uni04delta-ipv6/edpm/nodeset/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ transformers:
create: true

components:
- ../../../../lib/control-plane
- ../../control-plane
- ../../../../lib/dataplane/nodeset

resources:
Expand Down
114 changes: 1 addition & 113 deletions dt/uni04delta-ipv6/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ components:
- ../../lib/networking/metallb
- ../../lib/networking/netconfig
- ../../lib/networking/nad
- ../../lib/control-plane
- control-plane

resources:
- nad.yaml
Expand Down Expand Up @@ -82,17 +82,6 @@ replacements:
- spec.neutron.template.customServiceConfig
options:
create: true
- source:
kind: ConfigMap
name: service-values
fieldPath: data.ironic.enabled
targets:
- select:
kind: OpenStackControlPlane
fieldPaths:
- spec.ironic.enabled
options:
create: true
- source:
kind: ConfigMap
name: network-values
Expand All @@ -103,104 +92,3 @@ replacements:
name: ironic
fieldPaths:
- spec.config

- source:
kind: ConfigMap
name: service-values
fieldPath: data.ironic.rpcTransport
targets:
- select:
kind: OpenStackControlPlane
fieldPaths:
- spec.ironic.template.rpcTransport
options:
create: true

- source:
kind: ConfigMap
name: network-values
fieldPath: data.ctlplane.endpoint_annotations
targets:
- select:
kind: OpenStackControlPlane
fieldPaths:
- spec.ironic.template.ironicAPI.override.service.internal.metadata.annotations
options:
create: true

- source:
kind: ConfigMap
name: network-values
fieldPath: data.ctlplane.endpoint_annotations
targets:
- select:
kind: OpenStackControlPlane
fieldPaths:
- spec.ironic.template.ironicInspector.override.service.internal.metadata.annotations
options:
create: true

- source:
kind: ConfigMap
name: network-values
fieldPath: data.lbServiceType
targets:
- select:
kind: OpenStackControlPlane
fieldPaths:
- spec.ironic.template.ironicAPI.override.service.internal.spec.type
- spec.ironic.template.ironicInspector.override.service.internal.spec.type
options:
create: true

- source:
kind: ConfigMap
name: network-values
fieldPath: data.ironic.iface
targets:
- select:
kind: OpenStackControlPlane
fieldPaths:
- spec.ironic.template.ironicConductors.0.networkAttachments.0
- spec.ironic.template.ironicConductors.0.provisionNetwork
- spec.ironic.template.ironicInspector.inspectionNetwork
- spec.ironic.template.ironicInspector.networkAttachments.0
- spec.ovn.template.ovnController.nicMappings.ironic
options:
create: true

- source:
kind: ConfigMap
name: service-values
fieldPath: data.ironic.ironicConductors.0.customServiceConfig
targets:
- select:
kind: OpenStackControlPlane
fieldPaths:
- spec.ironic.template.ironicConductors.0.customServiceConfig
options:
create: true

- source:
kind: ConfigMap
name: service-values
fieldPath: data.ironic.ironicInspector.customServiceConfig
targets:
- select:
kind: OpenStackControlPlane
fieldPaths:
- spec.ironic.template.ironicInspector.customServiceConfig
options:
create: true

- source:
kind: ConfigMap
name: service-values
fieldPath: data.nova.cellTemplates
targets:
- select:
kind: OpenStackControlPlane
fieldPaths:
- spec.nova.template.cellTemplates
options:
create: true