Cleanup creation of host provisioner

1 files changed, 3 insertions, 1 deletions

diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
index 1cf698af9cb..05df332987e 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
@@ -31,7 +31,9 @@ public interface ModelContext {
     ApplicationPackage applicationPackage();
     Optional<Model> previousModel();
     Optional<ApplicationPackage> permanentApplicationPackage();
-    Optional<HostProvisioner> hostProvisioner();
+    // TODO: Remove after 7.338 has been released
+    default Optional<HostProvisioner> hostProvisioner() { return Optional.of(getHostProvisioner()); }
+    HostProvisioner getHostProvisioner();
     Provisioned provisioned();
     DeployLogger deployLogger();
     ConfigDefinitionRepo configDefinitionRepo();