Skip to content

Commit

Permalink
Merge pull request xapi-project#5654 from LunfanZhang/private/luzhan/…
Browse files Browse the repository at this point in the history
…CP-49668

CP-49668: Revert definition of the old 'vm_anti_affinity' feature flag
  • Loading branch information
robhoes authored May 30, 2024
2 parents c0e5dc4 + e35eeb2 commit 09158bc
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 5 deletions.
4 changes: 0 additions & 4 deletions ocaml/xapi-types/features.ml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ type feature =
| Updates
| Internal_repo_access
| VTPM
| VM_anti_affinity
[@@deriving rpc]

type orientation = Positive | Negative
Expand Down Expand Up @@ -133,9 +132,6 @@ let keys_of_features =
, ("restrict_internal_repo_access", Negative, "Internal_repo_access")
)
; (VTPM, ("restrict_vtpm", Negative, "VTPM"))
; ( VM_anti_affinity
, ("restrict_vm_anti_affinity", Negative, "VM_anti_affinity")
)
]

(* A list of features that must be considered "enabled" by `of_assoc_list`
Expand Down
1 change: 0 additions & 1 deletion ocaml/xapi-types/features.mli
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ type feature =
| Internal_repo_access
(** Enable restriction on repository access to pool members only *)
| VTPM (** Support VTPM device required by Win11 guests *)
| VM_anti_affinity (** Enable use of VM anti-affinity placement *)

val feature_of_rpc : Rpc.t -> feature
(** Convert RPC into {!feature}s *)
Expand Down

0 comments on commit 09158bc

Please sign in to comment.