Skip to content

Commit e114448

Browse files
committed
CP-54382 Reconfigure Auto mode when pool join and pool eject
- Copy auto mode setting from pool coordinator in pool join - Restore auto mode setting to default when pool eject Signed-off-by: Lunfan Zhang[Lunfan.Zhang] <[email protected]>
1 parent 50bc09a commit e114448

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

ocaml/xapi/xapi_pool.ml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1670,10 +1670,15 @@ let join_common ~__context ~master_address ~master_username ~master_password
16701670
Client.Host.get_console_idle_timeout ~rpc ~session_id
16711671
~self:remote_coordinator
16721672
in
1673+
let ssh_auto_mode =
1674+
Client.Host.get_ssh_auto_mode ~rpc ~session_id
1675+
~self:remote_coordinator
1676+
in
16731677
Xapi_host.set_console_idle_timeout ~__context ~self:me
16741678
~value:console_idle_timeout ;
16751679
Xapi_host.set_ssh_enabled_timeout ~__context ~self:me
16761680
~value:ssh_enabled_timeout ;
1681+
Xapi_host.set_ssh_auto_mode ~__context ~self:me ~value:ssh_auto_mode ;
16771682
let ssh_enabled =
16781683
Client.Host.get_ssh_enabled ~rpc ~session_id
16791684
~self:remote_coordinator
@@ -2056,6 +2061,8 @@ let eject_self ~__context ~host =
20562061
(* Restore SSH service to default state *)
20572062
Xapi_host.set_ssh_enabled_timeout ~__context ~self:host
20582063
~value:Constants.default_ssh_enabled_timeout ;
2064+
Xapi_host.set_ssh_auto_mode ~__context ~self:host
2065+
~value:!Xapi_globs.ssh_auto_mode_default ;
20592066
match Constants.default_ssh_enabled with
20602067
| true ->
20612068
Xapi_host.enable_ssh ~__context ~self:host

0 commit comments

Comments
 (0)