Merge pull request #153 from fao89/nodes

Move nodes to top level of nodeset spec
openstack-k8s-operators · Sep 13, 2023 · bc58d55 · bc58d55
2 parents 38336ce + b955ab2
commit bc58d55
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 32 deletions.
diff --git 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
@@ -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