From 940f6876f9be57e9bd37a7ddc37ecc2488f9839b Mon Sep 17 00:00:00 2001 From: Christian Schwede Date: Thu, 30 Oct 2025 16:16:18 +0100 Subject: [PATCH] Improve Swift dataplane sample config readability The Swift dataplane sample uses a slightly different intendation and variable naming than the actual CR. This was still valid because "oc kustomize" fixed this, eg. when using install_yamls. However, if using this as a reference to configure your own CR this is misleading. Fixing the variable name and intendation should improve readability. Output of "oc kustomize" is exactly the same as before. Signed-off-by: Christian Schwede --- .../dataplane/swift/kustomization.yaml | 4 ++-- config/samples/dataplane/swift/values.yaml | 22 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/config/samples/dataplane/swift/kustomization.yaml b/config/samples/dataplane/swift/kustomization.yaml index 11e29d7de..d1111714a 100644 --- a/config/samples/dataplane/swift/kustomization.yaml +++ b/config/samples/dataplane/swift/kustomization.yaml @@ -14,7 +14,7 @@ replacements: - source: kind: DataPlaneConfig name: edpm-swift-values - fieldPath: data.nodeset.nodetemplate.ansible.vars.edpm_swift_disks + fieldPath: data.nodeset.nodeTemplate.ansible.ansibleVars.edpm_swift_disks targets: - select: kind: OpenStackDataPlaneNodeSet @@ -36,7 +36,7 @@ replacements: - source: kind: DataPlaneConfig name: edpm-swift-values - fieldPath: data.nodeset.networkattachments + fieldPath: data.nodeset.networkAttachments targets: - select: kind: OpenStackDataPlaneNodeSet diff --git a/config/samples/dataplane/swift/values.yaml b/config/samples/dataplane/swift/values.yaml index 960bf5ff7..274daa32e 100644 --- a/config/samples/dataplane/swift/values.yaml +++ b/config/samples/dataplane/swift/values.yaml @@ -7,12 +7,12 @@ metadata: config.kubernetes.io/local-config: "true" data: nodeset: - networkattachments: + networkAttachments: - ctlplane - storage - nodetemplate: + nodeTemplate: ansible: - vars: + ansibleVars: # Swift disks defined here apply to all nodes. Node-specific disks # might be defined in the nodes: section below # @@ -22,11 +22,11 @@ data: # zone are optional and might be used to enforce distribution of # replicas edpm_swift_disks: - - device: /dev/vdb - path: /srv/node/vdb - weight: 4000 - region: 0 - zone: 0 + - device: /dev/vdb + path: /srv/node/vdb + weight: 4000 + region: 0 + zone: 0 nodes: edpm-swift-0: ansible: @@ -36,9 +36,9 @@ data: # node with a different disk. This node will use only vdc. It would # use vdb from parent section if not defined edpm_swift_disks: - - device: /dev/vdc - path: /srv/node/vdc - weight: 1000 + - device: /dev/vdc + path: /srv/node/vdc + weight: 1000 hostName: edpm-swift-0 networks: - defaultRoute: true