Enabled CNAME in http publish host for testing

We already had parsing code for this dating back to the 2.x era. Lucky us. fixes elastic#1186
williamrandolph · Oct 4, 2018 · 06766b9 · 06766b9
1 parent 04d2abf
commit 06766b9
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/...src/main/groovy/org/elasticsearch/hadoop/gradle/fixture/ElasticsearchFixturePlugin.groovy b/...src/main/groovy/org/elasticsearch/hadoop/gradle/fixture/ElasticsearchFixturePlugin.groovy
@@ -82,8 +82,15 @@ class ElasticsearchFixturePlugin implements Plugin<Project> {
             clusterConfig.setting("script.inline", "true")
             clusterConfig.setting("node.ingest", "true")
             clusterConfig.setting("script.max_compilations_rate", null)
-        } else if (majorVersion >= 6) {
+        } else if (majorVersion == 6) {
             clusterConfig.setting("node.ingest", "true")
+            clusterConfig.setting("http.host", "localhost")
+            clusterConfig.systemProperty('es.http.cname_in_publish_address', 'true')
+        } else if (majorVersion >= 7) {
+            clusterConfig.setting("node.ingest", "true")
+            clusterConfig.setting("http.host", "localhost")
+            // TODO: Remove this when this is the default in 7
+            clusterConfig.systemProperty('es.http.cname_in_publish_address', 'true')
         }
 
         // Also write a script to a file for use in tests