Merge branch 'master' into werror

Author: markgoddard

.github/workflows/deployment_yaml/enable-ironic.yml

@@ -6,6 +6,7 @@ ceph_managed: false
 ironic: true
 ironic_automated_cleaning: true
 kayobe_manages_physical_network: true
+physical_network_evpn: true
 wazuh: false
 wazuh_managed: false
 wazuh_ansible: false

source/_static/spine-leaf.png

@@ -16,24 +16,23 @@ Ceph Storage
 
    The Ceph deployment is not managed by StackHPC Ltd.
 
-Ceph Operations and Troubleshooting
-===================================
-
-.. include:: include/ceph_troubleshooting.rst
-
 Working with Ceph deployment tool
 =================================
 
 .. ifconfig:: deployment['ceph_ansible']
 
-   Ceph Ansible
-   ============
-
    .. include:: include/ceph_ansible.rst
 
 .. ifconfig:: deployment['cephadm']
 
-   cephadm
-   =======
-
    .. include:: include/cephadm.rst
+
+Operations
+==========
+
+.. include:: include/ceph_operations.rst
+
+Troubleshooting
+===============
+
+.. include:: include/ceph_troubleshooting.rst

source/ceph_storage.rst

@@ -20,6 +20,9 @@ ironic_automated_cleaning: true
 # Whether Kayobe manages physical network devices.
 kayobe_manages_physical_network: true
 
+# Whether the physical network is an EVPN fabric.
+physical_network_evpn: false
+
 # Whether the deployment includes Wazuh.
 wazuh: true