Merge pull request #282 from stackhpc/upstream/zed-2024-06-10

Synchronise zed with upstream
stackhpc · Jun 10, 2024 · a292490 · a292490
2 parents 81e37a3 + 41ee792
commit a292490
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/ansible/roles/kolla-openstack/molecule/default/molecule.yml b/ansible/roles/kolla-openstack/molecule/default/molecule.yml
@@ -8,8 +8,8 @@ driver:
 lint: |
   yamllint .
 platforms:
-  - name: centos-stream8
-    image: quay.io/centos/centos:stream8
+  - name: centos-stream9
+    image: quay.io/centos/centos:stream9
 provisioner:
   name: ansible
   lint:

diff --git a/ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml b/ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml
@@ -8,8 +8,8 @@ driver:
 lint: |
   yamllint .
 platforms:
-  - name: centos-stream8
-    image: quay.io/centos/centos:stream8
+  - name: centos-stream9
+    image: quay.io/centos/centos:stream9
 provisioner:
   name: ansible
   inventory:

diff --git a/doc/source/administration/seed.rst b/doc/source/administration/seed.rst
@@ -113,8 +113,7 @@ Backup
 It should be safe to keep services running during the backup, but for maximum
 safety they may optionally be stopped::
 
-    docker exec -it bifrost_deploy \
-    systemctl stop ironic-api ironic-conductor ironic-inspector
+    docker exec -it bifrost_deploy systemctl stop ironic ironic-inspector
 
 Then, to perform the backup::
 
@@ -123,17 +122,15 @@ Then, to perform the backup::
 
 If the services were stopped prior to the backup, start them again::
 
-    docker exec -it bifrost_deploy \
-    systemctl start ironic-api ironic-conductor ironic-inspector
+    docker exec -it bifrost_deploy systemctl start ironic ironic-inspector
 
 Restore
 ^^^^^^^
 
 Prior to restoring the database, the Ironic and Ironic Inspector services
 should be stopped::
 
-    docker exec -it bifrost_deploy \
-    systemctl stop ironic-api ironic-conductor ironic-inspector
+    docker exec -it bifrost_deploy systemctl stop ironic ironic-inspector
 
 The database may then safely be restored::
 
@@ -142,8 +139,7 @@ The database may then safely be restored::
 
 Finally, start the Ironic and Ironic Inspector services again::
 
-    docker exec -it bifrost_deploy \
-    systemctl start ironic-api ironic-conductor ironic-inspector
+    docker exec -it bifrost_deploy systemctl start ironic ironic-inspector
 
 Running Commands
 ================