diff --git a/examples/baremetal/kustomization.yaml b/examples/baremetal/kustomization.yaml index bf3657fd2..19ed67a1b 100644 --- a/examples/baremetal/kustomization.yaml +++ b/examples/baremetal/kustomization.yaml @@ -14,7 +14,7 @@ replacements: # OpenStackDataPlaneNodeSet customizations - source: kind: DataPlaneConfig - name: edpm-values + name: edpm-baremetal-values fieldPath: data.nodeset.nodetemplate.ansible.vars.edpm_sshd_allowed_ranges targets: - select: @@ -25,7 +25,7 @@ replacements: create: true - source: kind: DataPlaneConfig - name: edpm-values + name: edpm-baremetal-values fieldPath: data.nodeset.baremetalsettemplate targets: - select: @@ -36,7 +36,7 @@ replacements: create: true - source: kind: DataPlaneConfig - name: edpm-values + name: edpm-baremetal-values fieldPath: data.preProvisioned targets: - select: @@ -47,7 +47,7 @@ replacements: create: true - source: kind: DataPlaneConfig - name: edpm-values + name: edpm-baremetal-values fieldPath: data.nodeset.nodetemplate.networks targets: - select: diff --git a/examples/baremetal/values.yaml b/examples/baremetal/values.yaml index 8529fd7a8..18b5f9c35 100644 --- a/examples/baremetal/values.yaml +++ b/examples/baremetal/values.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: DataPlaneConfig metadata: - name: edpm-values + name: edpm-baremetal-values annotations: config.kubernetes.io/local-config: "true" data: diff --git a/examples/base/files/nic-config.j2 b/examples/base/files/nic-config.j2 new file mode 100644 index 000000000..144709d36 --- /dev/null +++ b/examples/base/files/nic-config.j2 @@ -0,0 +1,31 @@ +--- +{% set mtu_list = [ctlplane_mtu] %} +{% for network in role_networks %} +{{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }} +{%- endfor %} +{% set min_viable_mtu = mtu_list | max %} +network_config: +- type: ovs_bridge +name: {{ neutron_physical_bridge_name }} +mtu: {{ min_viable_mtu }} +use_dhcp: false +dns_servers: {{ ctlplane_dns_nameservers }} +domain: {{ dns_search_domains }} +addresses: +- ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_cidr }} +routes: {{ ctlplane_host_routes }} +members: +- type: interface + name: nic1 + mtu: {{ min_viable_mtu }} + # force the MAC address of the bridge to this interface + primary: true +{% for network in role_networks %} +- type: vlan + mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }} + vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }} + addresses: + - ip_netmask: + {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }} + routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }} +{% endfor %} diff --git a/examples/base/kustomization.yaml b/examples/base/kustomization.yaml index a2b08d249..f43f5db21 100644 --- a/examples/base/kustomization.yaml +++ b/examples/base/kustomization.yaml @@ -4,11 +4,22 @@ kind: Component resources: - crs/openstackdataplanenodeset.yaml - crs/openstackdataplanedeployment.yaml -- vars/nic-config.yaml -- vars/neutron.yaml namespace: openstack +configMapGenerator: +- name: network-config-template + files: + - network_config_template=files/nic-config.j2 + options: + disableNameSuffixHash: true +- name: neutron-edpm + literals: + - physical_bridge_name=br-ex + - public_interface_name=eth0 + options: + disableNameSuffixHash: true + configurations: - config/nodesetname.yaml - config/varsfromname.yaml diff --git a/examples/base/vars/neutron.yaml b/examples/base/vars/neutron.yaml deleted file mode 100644 index 8c21d8fa0..000000000 --- a/examples/base/vars/neutron.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: neutron-edpm -data: - physical_bridge_name: br-ex - public_interface_name: eth0 diff --git a/examples/base/vars/nic-config.yaml b/examples/base/vars/nic-config.yaml deleted file mode 100644 index f210e0de7..000000000 --- a/examples/base/vars/nic-config.yaml +++ /dev/null @@ -1,37 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: network-config-template -data: - network_config_template: | - --- - {% set mtu_list = [ctlplane_mtu] %} - {% for network in role_networks %} - {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }} - {%- endfor %} - {% set min_viable_mtu = mtu_list | max %} - network_config: - - type: ovs_bridge - name: {{ neutron_physical_bridge_name }} - mtu: {{ min_viable_mtu }} - use_dhcp: false - dns_servers: {{ ctlplane_dns_nameservers }} - domain: {{ dns_search_domains }} - addresses: - - ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_cidr }} - routes: {{ ctlplane_host_routes }} - members: - - type: interface - name: nic1 - mtu: {{ min_viable_mtu }} - # force the MAC address of the bridge to this interface - primary: true - {% for network in role_networks %} - - type: vlan - mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }} - vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }} - addresses: - - ip_netmask: - {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }} - routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }} - {% endfor %} diff --git a/examples/bgp/kustomization.yaml b/examples/bgp/kustomization.yaml index 66cdabbf8..bbb833661 100644 --- a/examples/bgp/kustomization.yaml +++ b/examples/bgp/kustomization.yaml @@ -4,7 +4,7 @@ kind: Component namespace: openstack components: -- ../base +- ../preprovisioned # for baremetal nodes, replace with baremetal resources: - values.yaml @@ -13,7 +13,7 @@ replacements: # OpenStackDataPlaneNodeSet customizations - source: kind: DataPlaneConfig - name: edpm-values + name: edpm-bgp-values fieldPath: data.nodeset.nodetemplate.ansible.vars targets: - select: @@ -24,7 +24,7 @@ replacements: create: true - source: kind: DataPlaneConfig - name: edpm-values + name: edpm-bgp-values fieldPath: data.nodeset.services targets: - select: diff --git a/examples/bgp/values.yaml b/examples/bgp/values.yaml index 116de7c0e..2aaaf6e7e 100644 --- a/examples/bgp/values.yaml +++ b/examples/bgp/values.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: DataPlaneConfig metadata: - name: edpm-values + name: edpm-bgp-values annotations: config.kubernetes.io/local-config: "true" data: diff --git a/examples/bgp_ovn_cluster/kustomization.yaml b/examples/bgp_ovn_cluster/kustomization.yaml index 66cdabbf8..249d23f65 100644 --- a/examples/bgp_ovn_cluster/kustomization.yaml +++ b/examples/bgp_ovn_cluster/kustomization.yaml @@ -4,7 +4,7 @@ kind: Component namespace: openstack components: -- ../base +- ../preprovisioned # for baremetal nodes, replace with baremetal resources: - values.yaml @@ -13,7 +13,7 @@ replacements: # OpenStackDataPlaneNodeSet customizations - source: kind: DataPlaneConfig - name: edpm-values + name: edpm-bgp-ovn-cluster-values fieldPath: data.nodeset.nodetemplate.ansible.vars targets: - select: @@ -24,7 +24,7 @@ replacements: create: true - source: kind: DataPlaneConfig - name: edpm-values + name: edpm-bgp-ovn-cluster-values fieldPath: data.nodeset.services targets: - select: diff --git a/examples/bgp_ovn_cluster/values.yaml b/examples/bgp_ovn_cluster/values.yaml index 43069e82f..892ebba60 100644 --- a/examples/bgp_ovn_cluster/values.yaml +++ b/examples/bgp_ovn_cluster/values.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: DataPlaneConfig metadata: - name: edpm-values + name: edpm-bgp-ovn-cluster-values annotations: config.kubernetes.io/local-config: "true" data: diff --git a/examples/ceph/kustomization.yaml b/examples/ceph/kustomization.yaml index c154e6c7e..24d140900 100644 --- a/examples/ceph/kustomization.yaml +++ b/examples/ceph/kustomization.yaml @@ -5,7 +5,7 @@ namespace: openstack nameSuffix: -ceph components: -- ../base +- ../preprovisioned # for baremetal nodes, replace with baremetal resources: - values.yaml @@ -14,7 +14,7 @@ replacements: # OpenStackDataPlaneNodeSet customizations - source: kind: DataPlaneConfig - name: edpm-values + name: edpm-ceph-values fieldPath: data.nodeset.services targets: - select: @@ -25,7 +25,7 @@ replacements: create: true - source: kind: DataPlaneConfig - name: edpm-values + name: edpm-ceph-values fieldPath: data.nodetemplate.extramounts targets: - select: diff --git a/examples/ceph/values.yaml b/examples/ceph/values.yaml index 2d42ba019..57553fc46 100644 --- a/examples/ceph/values.yaml +++ b/examples/ceph/values.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: DataPlaneConfig metadata: - name: edpm-values + name: edpm-ceph-values annotations: config.kubernetes.io/local-config: "true" data: diff --git a/examples/customnetworks/kustomization.yaml b/examples/customnetworks/kustomization.yaml index e18e6a55b..00ba307c5 100644 --- a/examples/customnetworks/kustomization.yaml +++ b/examples/customnetworks/kustomization.yaml @@ -5,7 +5,7 @@ namespace: openstack nameSuffix: -custom-network components: -- ../base +- ../preprovisioned # for baremetal nodes, replace with baremetal resources: - values.yaml @@ -14,7 +14,7 @@ replacements: # OpenStackDataPlaneNodeSet customizations - source: kind: DataPlaneConfig - name: edpm-values + name: edpm-custom-networks-values fieldPath: data.nodeset.nodetemplate.ansible.vars.neutron_public_interface_name targets: - select: @@ -25,7 +25,7 @@ replacements: create: true - source: kind: DataPlaneConfig - name: edpm-values + name: edpm-custom-networks-values fieldPath: data.nodeset.nodetemplate.ansible.vars.ctlplane_dns_nameservers targets: - select: @@ -36,7 +36,7 @@ replacements: create: true - source: kind: DataPlaneConfig - name: edpm-values + name: edpm-custom-networks-values fieldPath: data.nodeset.nodetemplate.ansible.vars.edpm_ovn_dbs targets: - select: @@ -47,7 +47,7 @@ replacements: create: true - source: kind: DataPlaneConfig - name: edpm-values + name: edpm-custom-networks-values fieldPath: data.nodeset.nodetemplate.ansible.vars.edpm_sshd_allowed_ranges targets: - select: @@ -58,7 +58,7 @@ replacements: create: true - source: kind: DataPlaneConfig - name: edpm-values + name: edpm-custom-networks-values fieldPath: data.nodeset.nodes targets: - select: diff --git a/examples/customnetworks/values.yaml b/examples/customnetworks/values.yaml index 19f2a8b43..81c95e7c3 100644 --- a/examples/customnetworks/values.yaml +++ b/examples/customnetworks/values.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: DataPlaneConfig metadata: - name: edpm-values + name: edpm-custom-networks-values annotations: config.kubernetes.io/local-config: "true" data: diff --git a/examples/networker/kustomization.yaml b/examples/networker/kustomization.yaml index d02dbce7c..14d01ddba 100644 --- a/examples/networker/kustomization.yaml +++ b/examples/networker/kustomization.yaml @@ -5,7 +5,7 @@ namespace: openstack nameSuffix: -networker components: -- ../base +- ../preprovisioned # for baremetal nodes, replace with baremetal resources: - values.yaml @@ -14,7 +14,7 @@ replacements: # OpenStackDataPlaneNodeSet customizations - source: kind: DataPlaneConfig - name: edpm-values + name: edpm-networker-values fieldPath: data.nodeset.nodetemplate.ansible.vars.edpm_enable_chassis_gw targets: - select: @@ -25,7 +25,7 @@ replacements: create: true - source: kind: DataPlaneConfig - name: edpm-values + name: edpm-networker-values fieldPath: data.nodeset.services targets: - select: @@ -36,7 +36,7 @@ replacements: create: true - source: kind: DataPlaneConfig - name: edpm-values + name: edpm-networker-values fieldPath: data.nodeset.nodes targets: - select: diff --git a/examples/networker/values.yaml b/examples/networker/values.yaml index 64dd24f47..73ee399c8 100644 --- a/examples/networker/values.yaml +++ b/examples/networker/values.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: DataPlaneConfig metadata: - name: edpm-values + name: edpm-networker-values annotations: config.kubernetes.io/local-config: "true" data: diff --git a/examples/nmstate/kustomization.yaml b/examples/nmstate/kustomization.yaml index 993e22faa..adc002370 100644 --- a/examples/nmstate/kustomization.yaml +++ b/examples/nmstate/kustomization.yaml @@ -4,7 +4,7 @@ kind: Component namespace: openstack components: -- ../base +- ../preprovisioned # for baremetal nodes, replace with baremetal resources: - values.yaml @@ -13,7 +13,7 @@ replacements: # OpenStackDataPlaneNodeSet customizations - source: kind: DataPlaneConfig - name: edpm-values + name: edpm-nmstate-values fieldPath: data.nodeset.nodetemplate.ansible.vars targets: - select: diff --git a/examples/nmstate/values.yaml b/examples/nmstate/values.yaml index 05bfd089a..eb5e29bc2 100644 --- a/examples/nmstate/values.yaml +++ b/examples/nmstate/values.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: DataPlaneConfig metadata: - name: edpm-values + name: edpm-nmstate-values annotations: config.kubernetes.io/local-config: "true" data: diff --git a/examples/nova_cell_custom/kustomization.yaml b/examples/nova_cell_custom/kustomization.yaml new file mode 100644 index 000000000..cb20d6b7f --- /dev/null +++ b/examples/nova_cell_custom/kustomization.yaml @@ -0,0 +1,33 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +namespace: openstack + +components: +- ../preprovisioned # for baremetal nodes, replace with baremetal + +resources: +- openstackdataplanenovaservice.yaml + +configMapGenerator: +- name: nova-extra-config + files: + - 25-nova-extra.conf=nova-extra.conf + options: + disableNameSuffixHash: true + +patches: +- target: + kind: OpenStackDataPlaneService + name: nova + patch: |- + - op: replace + path: /metadata/name + value: nova-cell-custom + - op: add + path: /spec/configMaps + value: + - nova-extra-config + +configurations: +- servicename.yaml diff --git a/examples/nova_cell_custom/nova-extra.conf b/examples/nova_cell_custom/nova-extra.conf new file mode 100644 index 000000000..e9de0ef51 --- /dev/null +++ b/examples/nova_cell_custom/nova-extra.conf @@ -0,0 +1,3 @@ +[compute] +cpu_shared_set = 2,6 +cpu_dedicated_set = 1,3,5,7 diff --git a/examples/nova_cell_custom/openstackdataplanenovaservice.yaml b/examples/nova_cell_custom/openstackdataplanenovaservice.yaml new file mode 100644 index 000000000..669eea54f --- /dev/null +++ b/examples/nova_cell_custom/openstackdataplanenovaservice.yaml @@ -0,0 +1,20 @@ +apiVersion: dataplane.openstack.org/v1beta1 +kind: OpenStackDataPlaneService +metadata: + name: nova +spec: + secrets: + - nova-cell1-compute-config + # NOTE: this Secret needs to be created before deploying the data plane. + # It should contain an ssh key-pair in the secret fields: ssh-privatekey + # and ssh-publickey + - nova-migration-ssh-key + playbook: osp.edpm.nova + tlsCert: + contents: + - dnsnames + - ips + networks: + - ctlplane + issuer: osp-rootca-issuer-internal + caCerts: combined-ca-bundle diff --git a/examples/nova_cell_custom/servicename.yaml b/examples/nova_cell_custom/servicename.yaml new file mode 100644 index 000000000..7d43116bd --- /dev/null +++ b/examples/nova_cell_custom/servicename.yaml @@ -0,0 +1,10 @@ +# This file is for teaching kustomize how to substitute OpenStackDataPlaneService name reference in OpenStackDataPlaneNodeSet +nameReference: +- kind: OpenStackDataPlaneService + version: v1beta1 + group: dataplane.openstack.org + fieldSpecs: + - kind: OpenStackDataPlaneNodeSet + version: v1beta1 + group: dataplane.openstack.org + path: spec/services diff --git a/examples/ovs_dpdk/kustomization.yaml b/examples/ovs_dpdk/kustomization.yaml index 72aea2d1c..b93691528 100644 --- a/examples/ovs_dpdk/kustomization.yaml +++ b/examples/ovs_dpdk/kustomization.yaml @@ -5,7 +5,7 @@ namespace: openstack nameSuffix: -ovs-dpdk components: -- ../base +- ../baremetal resources: - values.yaml @@ -14,7 +14,7 @@ replacements: # OpenStackDataPlaneNodeSet customizations - source: kind: DataPlaneConfig - name: edpm-values + name: edpm-ovs-dpdk-values fieldPath: data.nodeset.nodetemplate.ansible.vars targets: - select: @@ -25,7 +25,7 @@ replacements: create: true - source: kind: DataPlaneConfig - name: edpm-values + name: edpm-ovs-dpdk-values fieldPath: data.nodeset.services targets: - select: @@ -36,7 +36,7 @@ replacements: create: true - source: kind: DataPlaneConfig - name: edpm-values + name: edpm-ovs-dpdk-values fieldPath: data.nodeset.nodes targets: - select: @@ -47,7 +47,7 @@ replacements: create: true - source: kind: DataPlaneConfig - name: edpm-values + name: edpm-ovs-dpdk-values fieldPath: data.nodeset.baremetalsettemplate targets: - select: @@ -58,7 +58,7 @@ replacements: create: true - source: kind: DataPlaneConfig - name: edpm-values + name: edpm-ovs-dpdk-values fieldPath: data.preProvisioned targets: - select: @@ -69,7 +69,7 @@ replacements: create: true - source: kind: DataPlaneConfig - name: edpm-values + name: edpm-ovs-dpdk-values fieldPath: data.nodeset.nodetemplate.networks targets: - select: diff --git a/examples/ovs_dpdk/values.yaml b/examples/ovs_dpdk/values.yaml index 6bb6c9ed9..0f6df466d 100644 --- a/examples/ovs_dpdk/values.yaml +++ b/examples/ovs_dpdk/values.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: DataPlaneConfig metadata: - name: edpm-values + name: edpm-ovs-dpdk-values annotations: config.kubernetes.io/local-config: "true" data: diff --git a/examples/post_ceph_hci/kustomization.yaml b/examples/post_ceph_hci/kustomization.yaml index a9d08da0a..1ca420d47 100644 --- a/examples/post_ceph_hci/kustomization.yaml +++ b/examples/post_ceph_hci/kustomization.yaml @@ -6,7 +6,7 @@ namespace: openstack nameSuffix: -ceph components: -- ../base +- ../preprovisioned # for baremetal nodes, replace with baremetal resources: - values.yaml @@ -15,7 +15,7 @@ replacements: # OpenStackDataPlaneNodeSet customizations - source: kind: DataPlaneConfig - name: edpm-values + name: edpm-ceph-values fieldPath: data.nodeset.nodetemplate.ansible.vars targets: - select: @@ -26,7 +26,7 @@ replacements: create: true - source: kind: DataPlaneConfig - name: edpm-values + name: edpm-ceph-values fieldPath: data.nodeset.nodes targets: - select: @@ -37,7 +37,7 @@ replacements: create: true - source: kind: DataPlaneConfig - name: edpm-values + name: edpm-ceph-values fieldPath: data.nodeset.nodetemplate.extramounts targets: - select: @@ -49,7 +49,7 @@ replacements: # OpenStackDataPlaneDeployment customizations - source: kind: DataPlaneConfig - name: edpm-values + name: edpm-ceph-values fieldPath: data.deployment.services targets: - select: diff --git a/examples/post_ceph_hci/values.yaml b/examples/post_ceph_hci/values.yaml index 56eb78056..357aea6e3 100644 --- a/examples/post_ceph_hci/values.yaml +++ b/examples/post_ceph_hci/values.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: DataPlaneConfig metadata: - name: edpm-values + name: edpm-ceph-values annotations: config.kubernetes.io/local-config: "true" data: diff --git a/examples/pre_ceph_hci/kustomization.yaml b/examples/pre_ceph_hci/kustomization.yaml index 3bcbcd63d..446bf1191 100644 --- a/examples/pre_ceph_hci/kustomization.yaml +++ b/examples/pre_ceph_hci/kustomization.yaml @@ -6,7 +6,7 @@ namespace: openstack nameSuffix: -ceph components: -- ../base +- ../preprovisioned # for baremetal nodes, replace with baremetal resources: - values.yaml @@ -15,7 +15,7 @@ replacements: # OpenStackDataPlaneNodeSet customizations - source: kind: DataPlaneConfig - name: edpm-values + name: edpm-ceph-values fieldPath: data.nodeset.nodetemplate.ansible.vars targets: - select: @@ -26,7 +26,7 @@ replacements: create: true - source: kind: DataPlaneConfig - name: edpm-values + name: edpm-ceph-values fieldPath: data.nodeset.nodes targets: - select: @@ -37,7 +37,7 @@ replacements: create: true - source: kind: DataPlaneConfig - name: edpm-values + name: edpm-ceph-values fieldPath: data.deployment.services targets: - select: diff --git a/examples/pre_ceph_hci/values.yaml b/examples/pre_ceph_hci/values.yaml index 83b6534a2..5b6272efb 100644 --- a/examples/pre_ceph_hci/values.yaml +++ b/examples/pre_ceph_hci/values.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: DataPlaneConfig metadata: - name: edpm-values + name: edpm-ceph-values annotations: config.kubernetes.io/local-config: "true" data: diff --git a/examples/sriov/kustomization.yaml b/examples/sriov/kustomization.yaml index f2fce650d..02b1cec9b 100644 --- a/examples/sriov/kustomization.yaml +++ b/examples/sriov/kustomization.yaml @@ -5,7 +5,7 @@ namespace: openstack nameSuffix: -sriov components: -- ../base +- ../preprovisioned # for baremetal nodes, replace with baremetal resources: - values.yaml @@ -14,7 +14,7 @@ replacements: # OpenStackDataPlaneNodeSet customizations - source: kind: DataPlaneConfig - name: edpm-values + name: edpm-sriov-values fieldPath: data.nodeset.services targets: - select: diff --git a/examples/sriov/values.yaml b/examples/sriov/values.yaml index 4db18aa23..ed019a8b3 100644 --- a/examples/sriov/values.yaml +++ b/examples/sriov/values.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: DataPlaneConfig metadata: - name: edpm-values + name: edpm-sriov-values annotations: config.kubernetes.io/local-config: "true" data: diff --git a/examples/swift/kustomization.yaml b/examples/swift/kustomization.yaml index 5f45a6acb..11e29d7de 100644 --- a/examples/swift/kustomization.yaml +++ b/examples/swift/kustomization.yaml @@ -4,7 +4,7 @@ kind: Component namespace: openstack components: -- ../base +- ../preprovisioned # for baremetal nodes, replace with baremetal resources: - values.yaml @@ -13,7 +13,7 @@ replacements: # OpenStackDataPlaneNodeSet customizations - source: kind: DataPlaneConfig - name: edpm-values + name: edpm-swift-values fieldPath: data.nodeset.nodetemplate.ansible.vars.edpm_swift_disks targets: - select: @@ -24,7 +24,7 @@ replacements: create: true - source: kind: DataPlaneConfig - name: edpm-values + name: edpm-swift-values fieldPath: data.nodeset.services targets: - select: @@ -35,7 +35,7 @@ replacements: create: true - source: kind: DataPlaneConfig - name: edpm-values + name: edpm-swift-values fieldPath: data.nodeset.networkattachments targets: - select: @@ -46,7 +46,7 @@ replacements: create: true - source: kind: DataPlaneConfig - name: edpm-values + name: edpm-swift-values fieldPath: data.nodeset.nodes targets: - select: diff --git a/examples/swift/values.yaml b/examples/swift/values.yaml index 7c5f6084c..960bf5ff7 100644 --- a/examples/swift/values.yaml +++ b/examples/swift/values.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: DataPlaneConfig metadata: - name: edpm-values + name: edpm-swift-values annotations: config.kubernetes.io/local-config: "true" data: