Merge pull request #281 from jistr/f-dp3-prep

DP3 amendments part 1
openstack-k8s-operators · Feb 12, 2024 · ff9b204 · ff9b204
2 parents 65e8502 + 3163486
commit ff9b204
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 32 deletions.
diff --git a/docs_user/assemblies/openstack_adoption.adoc b/docs_user/assemblies/openstack_adoption.adoc
@@ -13,13 +13,13 @@ include::../modules/openstack-planning.adoc[leveloffset=+1]
 include::../modules/openstack-node-selector.adoc[leveloffset=+1]
 
 include::../modules/openstack-backend_services_deployment.adoc[leveloffset=+1]
+include::../modules/openstack-ceph_backend_configuration.adoc[leveloffset=+1]
 include::../modules/openstack-stop_openstack_services.adoc[leveloffset=+1]
 include::../modules/openstack-pull_openstack_configuration.adoc[leveloffset=+1]
 include::../modules/openstack-mariadb_copy.adoc[leveloffset=+1]
 include::../modules/openstack-ovn_adoption.adoc[leveloffset=+1]
 include::../modules/openstack-keystone_adoption.adoc[leveloffset=+1]
 include::../modules/openstack-neutron_adoption.adoc[leveloffset=+1]
-include::../modules/openstack-ceph_backend_configuration.adoc[leveloffset=+1]
 include::../modules/openstack-glance_adoption.adoc[leveloffset=+1]
 include::../modules/openstack-placement_adoption.adoc[leveloffset=+1]
 include::../modules/openstack-nova_adoption.adoc[leveloffset=+1]
@@ -36,4 +36,4 @@ include::../modules/openstack-edpm_adoption.adoc[leveloffset=+1]
 include::../modules/openstack-troubleshooting.adoc[leveloffset=+1]
 
 ifdef::parent-context[:context: {parent-context}]
-ifndef::parent-context[:!context:]
+ifndef::parent-context[:!context:]
diff --git a/docs_user/modules/generate.sh b/docs_user/modules/generate.sh
diff --git a/tests/playbooks/test_with_ceph.yaml b/tests/playbooks/test_with_ceph.yaml
@@ -30,13 +30,13 @@
   roles:
     - development_environment
     - backend_services
+    - ceph_backend_configuration
     - pull_openstack_configuration
     - stop_openstack_services
     - mariadb_copy
     - ovn_adoption
     - keystone_adoption
     - neutron_adoption
-    - ceph_backend_configuration
     - glance_adoption
     - placement_adoption
     - nova_adoption