honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

load shield for external cluster client 

Original commit: elastic/x-pack-elasticsearch@96e8df2ac3
This commit is contained in:
jaymode 2015-07-22 10:25:20 -04:00
parent 2dbeb1273d
commit d7d8ca125a
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
shield/src/test/java/org/elasticsearch/test/ShieldIntegrationTest.java
View File

@ -171,6 +171,7 @@ public abstract class ShieldIntegrationTest extends ElasticsearchIntegrationTest
@Override @Override
protected Settings externalClusterClientSettings() { protected Settings externalClusterClientSettings() {
return Settings.builder() return Settings.builder()
.put("plugin.types", ShieldPlugin.class.getName())
.put("shield.user", ShieldSettingsSource.DEFAULT_USER_NAME + ":" + ShieldSettingsSource.DEFAULT_PASSWORD) .put("shield.user", ShieldSettingsSource.DEFAULT_USER_NAME + ":" + ShieldSettingsSource.DEFAULT_PASSWORD)
.build(); .build();
} }

6
shield/src/test/java/org/elasticsearch/test/ShieldRestTestCase.java
View File

@ -88,7 +88,11 @@ public abstract class ShieldRestTestCase extends ShieldIntegrationTest {
@Override @Override
public Settings nodeSettings(int ordinal) { public Settings nodeSettings(int ordinal) {
return super.nodeSettings(ordinal); return Settings.builder()
.put(super.nodeSettings(ordinal))
.put(ShieldRestTestCase.super.nodeSettings(ordinal))
.put(Node.HTTP_ENABLED, true)
.build();
} }
@Override @Override