Skip to content

M #-: Fix merge conflicts - #1111

Merged
rsmontero merged 217 commits into
one-7.4-maintenancefrom
m-conflicts
Nov 11, 2026
Merged

rsmontero merged 217 commits into
one-7.4-maintenancefrom
m-conflicts

Conversation

@vickmp

@vickmp vickmp commented Nov 11, 2026

Copy link
Copy Markdown
Member

Description

Fix merge conflicts with one-7.4

Branches to which this PR applies

  • one-7.4-maintenance

  • Check this if this PR should not be squashed

rsmontero and others added 30 commits July 17, 2026 16:27
Replace Sunstone dashboard mockups with real screenshots in whats_new.md
for 7.4.

(cherry picked from commit 5a68f43)
- Improve Entra SAML configuration problems: use `opennebula` auth in
fireedge.conf, URL for MS login can be wrong
- Fixed some problems on the ISO deployment after LLM inference page
renaming

Co-authored-by: mattrowe-opennebula <mrowe@opennebula.io>
(cherry picked from commit b5efb2c)
(cherry picked from commit d86c594)
- Added missing new features
- Added missing bug fixes
- Added reference to compatibility
- Added documentation for MAC_GLOBAL_SPACE
Refreshes the OneProvider and OneProvision documentation screenshots for
the updated flows. Provider assets now include I3D.net screenshots in
place of Equinix, while AWS, Scaleway, common, on-premises, and
operation screenshots are updated across dark and light variants.

Signed-off-by: dcarracedo <dcarracedo@opennebula.io>
Signed-off-by: Jaime Conchello <jconchello@opennebula.io>
Co-authored-by: mattrowe-opennebula <mrowe@opennebula.io>
(cherry picked from commit 2684e35)
)

This PR updates the Getting started section of the documentation with
screenshots from the new Sunstone interface introduced in 7.4.

(cherry picked from commit 94f7f7b)
…orage docs (#779)

This PR updates Sunstone screenshots for installation docs, overview and
some storage docs. Also removes (EE) from OneKS and LVM docs.

(cherry picked from commit 8ac6ea5)
This PR includes OneKS and LVM as Community Edition features to the
release notes.
Updates Virtual Networks template, Virtual Routers and Security Groups
screenshots.

Co-authored-by: mattrowe-opennebula <mrowe@opennebula.io>
(cherry picked from commit 1eab2b0)
This PR updates the screenshots for OneKS

- Quick start @JavierPalomaresTorrecilla
- Lifecycle Management @jaimecb

Signed-off-by: Jaime Conchello <jconchello@opennebula.io>
Co-authored-by: JavierPalomaresTorrecilla <jpalomares@opennebula.io>
Co-authored-by: mattrowe-opennebula <mrowe@opennebula.io>
(cherry picked from commit 1390e92)
Updates Marketplace screenshots. Including Managing Marketplace
Appliances and Marketplaces in Sunstone.

Co-authored-by: mattrowe-opennebula <mrowe@opennebula.io>
(cherry picked from commit 256330e)
Explains how to use the CLI after a successful SAML login on sunstone.
That relies on creating a token and using it on the `ONE_AUTH` file.

(cherry picked from commit 4b9ed21)
Release notes updates. Some additional places where LVM is noted as EE
feature removed, these will also be later transferred to master and
one-7.4 maintenance in separate PRs.
Added Storage DRS and refined OneDRS docs

Signed-off-by: ms4ons <mstojiljkovic@opennebula.io>
Co-authored-by: mattrowe-opennebula <mrowe@opennebula.io>
(cherry picked from commit c008355)
…ances

This PR includes Sunstone screenshot updates for Virtual Networks and
Virtual machines.

(cherry picked from commit 82a33de)
This PR includes the update of the miniONE links in getting started
documentation, "Work In Progress" alerts in NICo and Slurm guides.
NVIDIA NICo TOC title has been changed and AI Factory guide inventories have been updated to 7.4.
tinova and others added 26 commits October 19, 2026 10:04
(cherry picked from commit fd32233)
Initial version of the DR document about NetApp Snapmirror DR

Signed-off-by: Neal Hansen <nhansen@opennebula.io>
Co-authored-by: mattrowe-opennebula <mrowe@opennebula.io>
(cherry picked from commit 5759daf)
initial documentation for disaster recovery using Veeam Backups

Signed-off-by: Neal Hansen <nhansen@opennebula.io>
Co-authored-by: mattrowe-opennebula <mrowe@opennebula.io>
(cherry picked from commit 7c815be)
This PR introduces new AI Factory screencasts in the screencasts page.
…1045)

This PR introduces a devcontainer for portable development of
documentation with GitHub codespaces. Opening a codespace on a branch
opens a browser-based VScode instance and makes available a
documentation preview in another tab.
This PR removes old OneLLM screencast.
(cherry picked from commit 353dd41)
This PR updates the Enforcing Resource Quotas screencasts in the
screencasts.md page.
A one-page integration blueprint for the CernVM-FS Proxy appliance. It
shows how to deploy the proxy and connect a VM, the workers of a
OneSlurm cluster, a OneKS cluster and the Open OnDemand Service to it.

Every recipe was tested on OpenNebula 7.4 with the final appliance
image, including OneSlurm 7.4.0-1 and a OneKS cluster with cvmfs-csi
2.6.0.

**Depends on OpenNebula/marketplace-community#141.** The page links to
two scripts that live in that pull request, so please merge #141 first,
or the links return 404.

---------

Co-authored-by: mattrowe-opennebula <mrowe@opennebula.io>
(cherry picked from commit 484f38c)
Correct the `datastore.conf` path in the Restic guide's Temporary Backup
Path section to `/var/lib/one/remotes/etc/datastore/datastore.conf`, so
administrators can locate the file for setting `BACKUP_BASE_PATH`.
This PR adds the CernVM-FS Proxy deployment documentation from:
#974, fixing a problem with a
broken relref due to page deletions in the master branch.

(cherry picked from commit e96c19e)
Co-authored-by: mattrowe-opennebula <mrowe@opennebula.io>
(cherry picked from commit fd84ae4)
…uide (#1082)

Fix the on-premises AI Factory deployment guide so its GPU inventories
bind the devices to `vfio-pci` and include them in the Host's PCI filter
with current OneDeploy. The guide also needs Front-end hostname
resolution and passwordless root SSH prerequisites, and should use
Hatch's Ansible environment consistently.

- Add `set_driver: vfio-pci` and `unlisted: false` to all four GPU
entries, document their defaults, and show full-domain PCI addresses
with `lspci -Dnn`.
- Explain hostname resolution, `ensure_hosts` and hostname renaming;
move root SSH setup before both deployment examples.
- Remove the separate pipx Ansible installation and make `hatch shell`
optional.
- Correct AMD IOMMU guidance in the deployment page and linked Host
Configuration guide; make bootloader instructions visible for every
architecture.
- Replace the stale OneDeploy PCI wiki link, repair the single-Host
section link, and document the non-GPU node's default filtering
behavior.
(cherry picked from commit 6189130)
…equisites (#1092)

Correct the 7.4 AI-ready Kubernetes guide and its OneKS prerequisites so
deployments use the TProxy OneGate endpoint, retain the settings through
OneDeploy, and start OneKS after Front-end reboots. Add a
private-network creation example, explain connectivity across Hosts, and
document the reported 7.4.1 MTU mismatch with the temporary workaround
and its device-creation limits.

Use a GPU Host to discover PCI identifiers, download kubectl for the
selected Kubernetes minor version, wait for both nodes to report Ready,
and apply VectorAdd before watching its pods.
This PR restructures VM documentation and review it technically

(cherry picked from commit 364c2b63a2901126beaf497cd566825a4913a4d6)
(cherry picked from commit 60d9a57)
Small changes lost in a previous conflict.
# Conflicts:
#	content/getting_started/install_opennebula/evaluation/deploy_opennebula_onprem_with_minione.md
#	content/getting_started/install_opennebula/production/cluster_oneform.md
#	content/getting_started/install_opennebula/production/minione_frontend_install.md
#	content/platform_services/oneks/management/configuration.md
#	content/product/cloud_system_administration/scheduler/drs.md
#	content/product/cluster_configuration/backup_system/veeam.md
#	content/product/cluster_configuration/lvm/lvm.md
#	content/product/cluster_configuration/networking_system/manage_vnets.md
#	content/product/cluster_configuration/pci_passthrough_sriov/network_interfaces.md
#	content/product/control_plane_configuration/high_availability/vm_ha.md
#	content/product/integration_references/infrastructure_drivers_development/interactive_backup.md
#	content/product/operation_references/configuration_references/template.md
#	content/software/installation_process/frontend_installation/frontend_install.md
#	content/software/installation_process/frontend_installation/overview.md
#	content/software/release_information/release_notes/known_issues.md
#	content/software/release_information/release_notes/platform_notes.md
#	content/software/release_information/release_notes/resolved_issues_741.md
#	content/software/upgrade_process/upgrade_guide/start_here.md
@vickmp
vickmp requested a review from rsmontero November 11, 2026 11:01
@rsmontero
rsmontero merged commit fa2133e into one-7.4-maintenance Nov 11, 2026
1 check failed
@rsmontero
rsmontero deleted the m-conflicts branch November 11, 2026 11:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.