Skip to content

Commit 7242fc0

Browse files
stuggiclaude
andcommitted
[b/r] Update restore README with ci-framework and manual procedure
Update automated Quick Start to use ci-framework playbooks. Rewrite manual restore procedure with fully rendered Restore CRs and resource modifier ConfigMap instead of Jinja2 template references. Update Velero version notes for OCP 4.20. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 38fb9f6 commit 7242fc0

3 files changed

Lines changed: 334 additions & 162 deletions

File tree

docs/dev/backup-restore/restore/06-manual-database-restore.md

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -127,27 +127,8 @@ oc delete galerarestore openstackrestore -n openstack
127127
oc delete galerarestore openstackrestorecell1 -n openstack
128128
```
129129

130-
### 8. Remove deployment-stage annotation
131-
132-
Resume full OpenStack deployment by removing the annotation:
133-
134-
```bash
135-
oc annotate openstackcontrolplane <name> -n openstack core.openstack.org/deployment-stage-
136-
```
137-
138-
Replace `<name>` with your OpenStackControlPlane CR name.
139-
140-
### 9. Wait for OpenStack services to start
141-
142-
```bash
143-
oc get pods -n openstack
144-
oc get openstackcontrolplane -n openstack
145-
```
146-
147130
## Next Steps
148131

149-
After database restore and annotation removal, proceed to:
150-
1. **Order 55**: Restore RabbitMQ credentials (see `06c-manual-rabbitmq-restore.md`)
151-
2. **Order 60**: Restore DataPlane resources (if applicable)
152-
3. See [Post-Restore](../README.md#post-restore-credential-rotation-and-edpm-nodes)
153-
for EDPM deployment and InstanceHa re-enablement
132+
After database restore, return to the main restore procedure in
133+
[README.md](README.md#step-6b-rabbitmq-credential-restore) for
134+
RabbitMQ credential restore and removing the deployment-stage annotation.

docs/dev/backup-restore/restore/06c-manual-rabbitmq-restore.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ oc delete namespace openstack-restore-tmp
8585

8686
## Next Steps
8787

88-
After RabbitMQ credential restore, proceed to:
89-
1. **Order 60**: Restore DataPlane resources (if applicable)
90-
2. See [Post-Restore](../README.md#post-restore-credential-rotation-and-edpm-nodes)
91-
for EDPM deployment and InstanceHa re-enablement
88+
After RabbitMQ credential restore, return to the main restore procedure in
89+
[README.md](README.md#step-6c-remove-deployment-stage-annotation) to
90+
remove the deployment-stage annotation and resume full deployment.

0 commit comments

Comments
 (0)