From b955ab2d8ef65f89009b4a47e50f91d67b35aeef Mon Sep 17 00:00:00 2001 From: Fabricio Aguiar Date: Wed, 13 Sep 2023 14:35:39 +0100 Subject: [PATCH] Move nodes to top level of nodeset spec ref: https://github.com/openstack-k8s-operators/dataplane-operator/pull/409 Signed-off-by: Fabricio Aguiar --- docs/openstack/edpm_adoption.md | 32 +++++++++---------- .../roles/dataplane_adoption/tasks/main.yaml | 32 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/docs/openstack/edpm_adoption.md b/docs/openstack/edpm_adoption.md index f640f408d..47c141dcc 100644 --- a/docs/openstack/edpm_adoption.md +++ b/docs/openstack/edpm_adoption.md @@ -156,24 +156,24 @@ done value: "True" - name: ANSIBLE_ENABLE_TASK_DEBUGGER value: "True" + nodes: + standalone: + hostName: standalone + ansible: + ansibleHost: 192.168.122.100 + networks: + - defaultRoute: true + fixedIP: 192.168.122.100 + name: CtlPlane + subnetName: subnet1 + - name: InternalApi + subnetName: subnet1 + - name: Storage + subnetName: subnet1 + - name: Tenant + subnetName: subnet1 nodeTemplate: ansibleSSHPrivateKeySecret: dataplane-adoption-secret - nodes: - standalone: - hostName: standalone - ansible: - ansibleHost: 192.168.122.100 - networks: - - defaultRoute: true - fixedIP: 192.168.122.100 - name: CtlPlane - subnetName: subnet1 - - name: InternalApi - subnetName: subnet1 - - name: Storage - subnetName: subnet1 - - name: Tenant - subnetName: subnet1 managementNetwork: ctlplane ansible: ansibleUser: root diff --git a/tests/roles/dataplane_adoption/tasks/main.yaml b/tests/roles/dataplane_adoption/tasks/main.yaml index e6c0c9c71..33e2afd01 100644 --- a/tests/roles/dataplane_adoption/tasks/main.yaml +++ b/tests/roles/dataplane_adoption/tasks/main.yaml @@ -166,24 +166,24 @@ value: "True" - name: ANSIBLE_ENABLE_TASK_DEBUGGER value: "True" + nodes: + standalone: + hostName: standalone + ansible: + ansibleHost: {{ edpm_node_ip }} + networks: + - defaultRoute: true + fixedIP: {{ edpm_node_ip }} + name: CtlPlane + subnetName: subnet1 + - name: InternalApi + subnetName: subnet1 + - name: Storage + subnetName: subnet1 + - name: Tenant + subnetName: subnet1 nodeTemplate: ansibleSSHPrivateKeySecret: {{ ansibleSSHPrivateKeySecret }} - nodes: - standalone: - hostName: standalone - ansible: - ansibleHost: {{ edpm_node_ip }} - networks: - - defaultRoute: true - fixedIP: {{ edpm_node_ip }} - name: CtlPlane - subnetName: subnet1 - - name: InternalApi - subnetName: subnet1 - - name: Storage - subnetName: subnet1 - - name: Tenant - subnetName: subnet1 managementNetwork: ctlplane ansible: ansiblePort: 22