Skip to content

Improve Swift dataplane sample config readability #1673

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −13
Open

Improve Swift dataplane sample config readability #1673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions config/samples/dataplane/swift/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -36,7 +36,7 @@ replacements:
- source:
kind: DataPlaneConfig
name: edpm-swift-values
fieldPath: data.nodeset.networkattachments
fieldPath: data.nodeset.networkAttachments
targets:
- select:
kind: OpenStackDataPlaneNodeSet
Expand Down
22 changes: 11 additions & 11 deletions config/samples/dataplane/swift/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
Expand All @@ -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:
Expand All @@ -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
Expand Down