Use setting in integration test cluster config

This commit modifies using system properties to configure an integration
test cluster and instead use settings in the generated Elasticsearch
config file.

Original commit: elastic/x-pack-elasticsearch@65211b93d0
This commit is contained in:
Jason Tedor 2016-03-15 20:01:01 -04:00
parent edc9580f66
commit 69b69f7af1
7 changed files with 26 additions and 26 deletions

View File

@ -7,8 +7,8 @@ dependencies {
integTest { integTest {
cluster { cluster {
plugin 'x-pack', project(':x-plugins:elasticsearch:x-pack') plugin 'x-pack', project(':x-plugins:elasticsearch:x-pack')
systemProperty 'es.shield.audit.enabled', 'true' setting 'shield.audit.enabled', 'true'
systemProperty 'es.shield.audit.outputs', 'index' setting 'shield.audit.outputs', 'index'
setupCommand 'setupDummyUser', setupCommand 'setupDummyUser',
'bin/xpack/esusers', 'useradd', 'test_user', '-p', 'changeme', '-r', 'admin' 'bin/xpack/esusers', 'useradd', 'test_user', '-p', 'changeme', '-r', 'admin'
waitCondition = { node, ant -> waitCondition = { node, ant ->

View File

@ -34,8 +34,8 @@ integTest {
cluster { cluster {
plugin 'x-pack', project(':x-plugins:elasticsearch:x-pack') plugin 'x-pack', project(':x-plugins:elasticsearch:x-pack')
systemProperty 'es.xpack.watcher.enabled', 'false' setting 'xpack.watcher.enabled', 'false'
systemProperty 'es.xpack.monitoring.enabled', 'false' setting 'xpack.monitoring.enabled', 'false'
setupCommand 'setupDummyUser', setupCommand 'setupDummyUser',
'bin/xpack/esusers', 'useradd', 'test_user', '-p', 'changeme', '-r', 'admin' 'bin/xpack/esusers', 'useradd', 'test_user', '-p', 'changeme', '-r', 'admin'
waitCondition = { node, ant -> waitCondition = { node, ant ->

View File

@ -17,10 +17,10 @@ integTest {
cluster { cluster {
plugin 'x-pack', project(':x-plugins:elasticsearch:x-pack') plugin 'x-pack', project(':x-plugins:elasticsearch:x-pack')
// TODO: these should be settings? // TODO: these should be settings?
systemProperty 'es.shield.authc.realms.custom.order', '0' setting 'shield.authc.realms.custom.order', '0'
systemProperty 'es.shield.authc.realms.custom.type', 'custom' setting 'shield.authc.realms.custom.type', 'custom'
systemProperty 'es.shield.authc.realms.esusers.order', '1' setting 'shield.authc.realms.esusers.order', '1'
systemProperty 'es.shield.authc.realms.esusers.type', 'esusers' setting 'shield.authc.realms.esusers.type', 'esusers'
setupCommand 'setupDummyUser', setupCommand 'setupDummyUser',
'bin/xpack/esusers', 'useradd', 'test_user', '-p', 'changeme', '-r', 'admin' 'bin/xpack/esusers', 'useradd', 'test_user', '-p', 'changeme', '-r', 'admin'

View File

@ -6,7 +6,7 @@ dependencies {
integTest { integTest {
cluster { cluster {
systemProperty 'es.script.inline', 'true' setting 'script.inline', 'true'
plugin 'x-pack', project(':x-plugins:elasticsearch:x-pack') plugin 'x-pack', project(':x-plugins:elasticsearch:x-pack')
extraConfigFile 'xpack/roles.yml', 'roles.yml' extraConfigFile 'xpack/roles.yml', 'roles.yml'
[ [

View File

@ -145,18 +145,18 @@ project.rootProject.subprojects.findAll { it.path.startsWith(':plugins:') }.each
integTest { integTest {
cluster { cluster {
systemProperty 'es.xpack.monitoring.agent.interval', '3s' setting 'xpack.monitoring.agent.interval', '3s'
systemProperty 'es.xpack.monitoring.agent.exporters._http.type', 'http' setting 'xpack.monitoring.agent.exporters._http.type', 'http'
systemProperty 'es.xpack.monitoring.agent.exporters._http.enabled', 'false' setting 'xpack.monitoring.agent.exporters._http.enabled', 'false'
systemProperty 'es.xpack.monitoring.agent.exporters._http.ssl.truststore.path', clientKeyStore.name setting 'xpack.monitoring.agent.exporters._http.ssl.truststore.path', clientKeyStore.name
systemProperty 'es.xpack.monitoring.agent.exporters._http.ssl.truststore.password', 'keypass' setting 'xpack.monitoring.agent.exporters._http.ssl.truststore.password', 'keypass'
systemProperty 'es.xpack.monitoring.agent.exporters._http.auth.username', 'monitoring_agent' setting 'xpack.monitoring.agent.exporters._http.auth.username', 'monitoring_agent'
systemProperty 'es.xpack.monitoring.agent.exporters._http.auth.password', 'changeme' setting 'xpack.monitoring.agent.exporters._http.auth.password', 'changeme'
systemProperty 'es.shield.transport.ssl', 'true' setting 'shield.transport.ssl', 'true'
systemProperty 'es.shield.http.ssl', 'true' setting 'shield.http.ssl', 'true'
systemProperty 'es.shield.ssl.keystore.path', nodeKeystore.name setting 'shield.ssl.keystore.path', nodeKeystore.name
systemProperty 'es.shield.ssl.keystore.password', 'keypass' setting 'shield.ssl.keystore.password', 'keypass'
plugin 'x-pack', project(':x-plugins:elasticsearch:x-pack') plugin 'x-pack', project(':x-plugins:elasticsearch:x-pack')

View File

@ -8,8 +8,8 @@ dependencies {
integTest { integTest {
cluster { cluster {
plugin 'x-pack', project(':x-plugins:elasticsearch:x-pack') plugin 'x-pack', project(':x-plugins:elasticsearch:x-pack')
systemProperty 'es.script.inline', 'true' setting 'script.inline', 'true'
systemProperty 'es.xpack.shield.enabled', 'false' setting 'xpack.shield.enabled', 'false'
systemProperty 'es.xpack.monitoring.enabled', 'false' setting 'xpack.monitoring.enabled', 'false'
} }
} }

View File

@ -8,8 +8,8 @@ dependencies {
integTest { integTest {
cluster { cluster {
plugin 'x-pack', project(':x-plugins:elasticsearch:x-pack') plugin 'x-pack', project(':x-plugins:elasticsearch:x-pack')
systemProperty 'es.xpack.shield.enabled', 'false' setting 'xpack.shield.enabled', 'false'
systemProperty 'es.xpack.monitoring.enabled', 'false' setting 'xpack.monitoring.enabled', 'false'
systemProperty 'es.http.port', '9400' setting 'http.port', '9400'
} }
} }