Improve warning for usage of deprecated 'domain' attribute

1 files changed, 6 insertions, 1 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/HttpBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/HttpBuilder.java
index 43fa515e7c3..866709df0b7 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/HttpBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/HttpBuilder.java
@@ -115,7 +115,12 @@ public class HttpBuilder extends VespaDomBuilder.DomConfigProducerBuilder<Http>
                 throw new IllegalArgumentException(
                         String.format("Domain in access-control ('%s') does not match tenant domain ('%s')", explicitDomain.value(), tenantDomain.value()));
             }
-            deployState.getDeployLogger().logApplicationPackage(Level.WARNING, "Domain in 'access-control' is deprecated and will be removed soon");
+            deployState.getDeployLogger()
+                    .logApplicationPackage(Level.WARNING,
+                            "Domain in 'access-control' is deprecated and is no longer necessary. " +
+                                    "Please remove the 'domain' attribute from the 'access-control' element in services.xml. " +
+                                    "Mismatch between the Athenz domain associated with your tenant and the 'domain' " +
+                                    "attribute will be handled as an error.");
         }
         return tenantDomain != null ? tenantDomain : explicitDomain;
     }