From 65f24340eb73b6a898af3f7a7769aa22c3b2a5a4 Mon Sep 17 00:00:00 2001 From: johnsonw Date: Thu, 28 May 2020 11:43:28 -0400 Subject: [PATCH] - more updates --- chroma_core/models/client_mount.py | 4 ++++ chroma_core/models/host.py | 13 +------------ 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/chroma_core/models/client_mount.py b/chroma_core/models/client_mount.py index be4e5294cc..878bf01b87 100644 --- a/chroma_core/models/client_mount.py +++ b/chroma_core/models/client_mount.py @@ -41,6 +41,10 @@ def get_deps(self, state=None): state = self.state deps = [] + + if self.host.immutable_state: + return DependAll(deps) + if state == "mounted": # Depend on this mount's host having LNet up. If LNet is stopped # on the host, this filesystem will be unmounted first. diff --git a/chroma_core/models/host.py b/chroma_core/models/host.py index d9024ad700..477b001a97 100644 --- a/chroma_core/models/host.py +++ b/chroma_core/models/host.py @@ -898,19 +898,8 @@ class Meta: ordering = ["id"] def get_deps(self): - # Moving out of unconfigured into lnet_unloaded will mean that lnet will start monitoring and responding to - # the state. Once we start monitoring any state other than unconfigured is acceptable. deps = self._common_deps() - if self.target_object.lnet_configuration: - deps.append( - DependOn( - self.target_object.lnet_configuration, - "lnet_unloaded", - unacceptable_states=["unconfigured"] - ) - ) - return DependAll(deps) def description(self): @@ -933,7 +922,7 @@ class Meta: def get_deps(self): deps = self._common_deps() - if self.target_object.lnet_configuration: + if self.target_object.lnet_configuration and not self.target_object.immutable_state: deps.append( DependOn( self.target_object.lnet_configuration,