Merge branch 'main' into cephnfs-adoption

Makefile

@@ -16,6 +16,10 @@ test-with-ceph:
 	mkdir -p tests/logs
 	ANSIBLE_CONFIG=$(TEST_CONFIG) ansible-playbook -v -i $(TEST_INVENTORY) -e @$(TEST_VARS) -e @$(TEST_SECRETS) tests/playbooks/test_with_ceph.yaml 2>&1 | tee $(TEST_OUTFILE)
 
+test-swift-migration: TEST_OUTFILE := tests/logs/test_swift_migration_out_$(shell date +%FT%T%Z).log
+test-swift-migration:
+	mkdir -p tests/logs
+	ANSIBLE_CONFIG=$(TEST_CONFIG) ansible-playbook -v -i $(TEST_INVENTORY) -e @$(TEST_VARS) -e @$(TEST_SECRETS) tests/playbooks/test_swift_migration.yaml 2>&1 | tee $(TEST_OUTFILE)
 
 ### DOCS ###
 

docs_user/assemblies/ceph_migration.adoc

@@ -12,6 +12,7 @@ ifdef::context[:parent-context: {context}]
 include::../modules/ceph-rbd_migration.adoc[leveloffset=+1]
 include::../modules/ceph-rgw_migration.adoc[leveloffset=+1]
 include::../modules/ceph-mds_migration.adoc[leveloffset=+1]
+include::../modules/ceph-monitoring_migration.adoc[leveloffset=+1]
 
 ifdef::parent-context[:context: {parent-context}]
 ifndef::parent-context[:!context:]

docs_user/assemblies/swift_migration.adoc

@@ -0,0 +1,15 @@
+ifdef::context[:parent-context: {context}]
+
+[id="swift-migration_{context}"]
+
+= Object Storage data migration
+
+:context: swift-migration
+
+:toc: left
+:toclevels: 3
+
+include::../modules/openstack-swift_migration.adoc[leveloffset=+1]
+
+ifdef::parent-context[:context: {parent-context}]
+ifndef::parent-context[:!context:]

docs_user/main.adoc

@@ -9,3 +9,5 @@
 include::assemblies/openstack_adoption.adoc[leveloffset=+1]
 
 include::assemblies/ceph_migration.adoc[leveloffset=+1]
+
+include::assemblies/swift_migration.adoc[leveloffset=+1]

docs_user/modules/ceph-mds_migration.adoc

@@ -122,7 +122,7 @@ Check the current OSD blocklist and clean up the client list:
 [ceph: root@controller-0 /]# ceph osd blocklist ls
 ..
 ..
-for item in $(ceph osd blocklist ls | awk ‘{print $0}’); do
+for item in $(ceph osd blocklist ls | awk '{print $0}'); do
      ceph osd blocklist rm $item;
 done
 ----