Merge pull request openstack-k8s-operators#159 from fao89/deployment

Adding OpenStackDataPlaneDeployment CR
fao89 · Sep 19, 2023 · 5248ac6 · 5248ac6
2 parents 2af62ea + 8a764c3
commit 5248ac6
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 6 deletions.
diff --git a/docs/openstack/edpm_adoption.md b/docs/openstack/edpm_adoption.md
@@ -150,8 +150,6 @@ done
   metadata:
     name: openstack
   spec:
-    deployStrategy:
-      deploy: true
     networkAttachments:
         - ctlplane
     preProvisioned: true
@@ -243,6 +241,20 @@ done
   EOF
   ```
 
+* Deploy OpenStackDataPlaneDeployment:
+
+  ```
+  oc apply -f - <<EOF
+  apiVersion: dataplane.openstack.org/v1beta1
+  kind: OpenStackDataPlaneDeployment
+  metadata:
+    name: openstack
+  spec:
+    nodeSets:
+    - openstack
+  EOF
+  ```
+
 ## Post-checks
 
 * Check if all the Ansible EE pods reaches `Completed` status:

diff --git a/tests/roles/dataplane_adoption/defaults/main.yaml b/tests/roles/dataplane_adoption/defaults/main.yaml
@@ -2,7 +2,5 @@ registry_name: "quay.io"
 registry_namespace: "podified-antelope-centos9"
 image_tag: "current-podified"
 ansibleSSHPrivateKeySecret: dataplane-adoption-secret
-deployStrategy:
-  deploy: false
 default_edpm_chrony_ntp_servers:
   - pool.ntp.org
diff --git a/tests/roles/dataplane_adoption/tasks/main.yaml b/tests/roles/dataplane_adoption/tasks/main.yaml
@@ -162,8 +162,6 @@
     metadata:
       name: openstack
     spec:
-      deployStrategy:
-        deploy: true
       networkAttachments:
         - ctlplane
       preProvisioned: true
@@ -252,6 +250,21 @@
             plan: overcloud
     EOF
 
+- name: deploy the dataplane deployment
+  no_log: "{{ use_no_log }}"
+  ansible.builtin.shell: |
+    {{ shell_header }}
+    {{ oc_header }}
+    oc apply -f - <<EOF
+    apiVersion: dataplane.openstack.org/v1beta1
+    kind: OpenStackDataPlaneDeployment
+    metadata:
+      name: openstack
+    spec:
+      nodeSets:
+      - openstack
+    EOF
+
 - name: wait for dataplane node set to be ready
   ansible.builtin.shell: |
     {{ shell_header }}