Skip to content

Commit dede62f

Browse files
stuggiclaude
andcommitted
Add PVC/PV restore step to infrastructure-only workflow
Add PVC restore step in the workflow after infrastructure is ready but before database restore. This ensures PVCs are restored while services are paused in infrastructure-only mode. The flow is now: 1. Infrastructure Ready (creates empty PVCs) 2. Restore PVCs/PVs from OADP or other backup method 3. Restore database contents (MariaDB, OVN) 4. Resume deployment This aligns with the OADP integration documentation where PVC restore happens after InfrastructureReady condition but before resuming deployment. Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
1 parent d7610f5 commit dede62f

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

docs/dev/backup-restore-ctlplane.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,8 @@ flowchart TD
147147
WaitInfra -->|Not Ready| WaitInfra
148148
WaitInfra -->|Ready| InfraReady[Infrastructure Ready:<br/>✓ Galera<br/>✓ OVN NB/SB<br/>✓ RabbitMQ<br/>✓ Memcached]
149149
150-
InfraReady --> RestoreMariaDB[Restore MariaDB Database Contents]
150+
InfraReady --> RestorePVC[Restore PVCs/PVs<br/>From OADP or other backup method<br/>Optional: only if PVC data backed up]
151+
RestorePVC --> RestoreMariaDB[Restore MariaDB Database Contents]
151152
RestoreMariaDB --> RestoreOVN[Restore OVN Database Contents<br/>NB & SB databases]
152153
RestoreOVN --> RestoreRabbitMQ[Restore RabbitMQ User Credentials<br/>for EDPM compatibility]
153154
@@ -165,6 +166,7 @@ flowchart TD
165166
style InfraReady fill:#90EE90
166167
style ServicesReady fill:#90EE90
167168
style RestoreCtlPlane fill:#FFE4B5
169+
style RestorePVC fill:#FFE4B5
168170
style Resume fill:#FFE4B5
169171
style WaitInfra fill:#87CEEB
170172
style WaitServices fill:#87CEEB
@@ -174,9 +176,10 @@ flowchart TD
174176
- **Prerequisites**: Cluster infrastructure must exist first (StorageClass, NNCP, MetalLB) - either still present or restored separately
175177
- **Staged Deployment**: Infrastructure (databases, message queue) is created first with annotation `core.openstack.org/deployment-stage: "infrastructure-only"`
176178
- **OpenStackControlPlaneInfrastructureReady Condition**: Single condition check validates all infrastructure components are ready
179+
- **PVC Restore**: After infrastructure is ready, PVCs are created (but empty). Restore PVC data from OADP or other backup method while services are paused
177180
- **Database Restore**: Performed while OpenStack services are NOT yet created (clean restore)
178181
- **Resume Deployment**: Removing the `core.openstack.org/deployment-stage` annotation triggers creation of OpenStack services
179-
- **Services Start Clean**: Keystone, Nova, etc. start with already-restored databases (no restarts needed)
182+
- **Services Start Clean**: Keystone, Nova, etc. start with already-restored databases and PVCs (no restarts needed)
180183

181184
**Staged Deployment Feature**: The staged deployment mechanism using the `core.openstack.org/deployment-stage` annotation is a key feature for reliable restores. For detailed context on why this feature was implemented and how it works, see [enhancement-staged-deployment-restore.md](enhancement-staged-deployment-restore.md).
182185

0 commit comments

Comments
 (0)