CP-53721 Enable XAPI to configure SSH auto mode #6442
+161
−15
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
LunfanZhang
force-pushed
the
private/lunfan/CP-53721
branch
from
8a0098f to
ffe74a1
Compare
changlei-li
reviewed
Apr 28, 2025
minglumlu
reviewed
Apr 28, 2025
LunfanZhang
commented
Apr 28, 2025
ocaml/xapi/xapi_host.ml
Outdated
| value ; | ||
|
|
||
| if value && Db.Host.get_ssh_enabled ~__context ~self then | ||
| raise (Api_errors.Server_error (Api_errors.ssh_auto_mode_conflict, [])) ; |
There was a problem hiding this comment.
When a user manually enables SSH using host.enable_ssh, we assume they expect SSH to remain enabled continuously. Therefore, we must set auto-mode to false; otherwise, auto-mode would automatically disable the SSH that the user just explicitly enabled.
changlei-li
approved these changes
Apr 29, 2025
LunfanZhang
force-pushed
the
private/lunfan/CP-53721
branch
from
ffe74a1 to
c196dc5
Compare
BengangY
reviewed
May 7, 2025
minglumlu
reviewed
May 7, 2025
|
I marked this as Draft while we are still reviewing the design. |
Add new host object fields: - ssh_auto_mode Add new host/pool API to enable to set auto mode - set_ssh_auto_mode Signed-off-by: Lunfan Zhang <[email protected]>
LunfanZhang
force-pushed
the
private/lunfan/CP-53721
branch
from
c196dc5 to
e139fbe
Compare
LunfanZhang
changed the base branch from
feature/configure-ssh-phase2
to
feature/configure-ssh-phase3
LunfanZhang
force-pushed
the
private/lunfan/CP-53721
branch
from
e139fbe to
48cfe77
Compare
|
Update base branch to feature/configure-ssh-phase3 (NOTE: Default auto mode setting for XS8/XS9, pool join/eject operations will not include in this PR) |
minglumlu
reviewed
May 19, 2025
minglumlu
approved these changes
May 19, 2025
Implemented XAPI APIs for SSH auto mode configuration: - `host.set_ssh_auto_mode`: Configures SSH auto mode for a specific host. - `pool.set_ssh_auto_mode`: Configures SSH auto mode for all hosts in the pool. Additionally: - `host.enable_ssh` now automatically sets SSH auto mode to `false`. Signed-off-by: Lunfan Zhang <[email protected]>
Updated `records.ml` file to support `host-param-set/get/list` and `pool-param-set/get/list` for ssh-auto-mode. Signed-off-by: Lunfan Zhang <[email protected]>
LunfanZhang
force-pushed
the
private/lunfan/CP-53721
branch
from
48cfe77 to
9624328
Compare
|
Hi @robhoes Since we have completed some offline reviews locally, if you have no further comments, this PR will be merged. |
lindig
approved these changes
May 19, 2025
|
|
||
| let set_ssh_auto_mode ~__context ~self ~value = | ||
| info "Pool.set_ssh_auto_mode: pool='%s' value='%b'" | ||
| (pool_uuid ~__context self) |
There was a problem hiding this comment.
I believe we report at the API level the reference (rather the UUID) in logs. User-facing messages report the UUID, though.
| let disable_ssh_internal ~__context ~self = | ||
| try | ||
| debug "Disabling SSH for host %s" (Helpers.get_localhost_uuid ()) ; | ||
| Xapi_systemctl.disable ~wait_until_success:false !Xapi_globs.ssh_service ; | ||
| if Db.Host.get_ssh_auto_mode ~__context ~self = false then |
There was a problem hiding this comment.
Could use if not (Db.Host.get_ssh_auto_mode .. )
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR introduces support for Dom0 SSH control, providing the capability to configure the auto mode for a specific host or all hosts in the pool.
New Host Object Fields and Host/Pool API:
ssh_auto_mode: Indicates whether SSH auto mode is enabled. configure to true means startup SSH when the XAPI service is down; stop SSH when the XAPI service is up. configure to false means SSH service status is independent and not effected by the XAPI service status.set_ssh_auto_mode: Allows setting auto mode for specific host or all hosts in the pool.(Note: Default value for XS8/XS9, pool join/eject operations, and XAPI startup scenarios will be addressed in the next PR, this PR only include the change of data_mode/API/cli )