From 1abc40c64505406503a3c0ee62bf97dad85c2faa Mon Sep 17 00:00:00 2001 From: Tim Brooks Date: Fri, 14 Jul 2017 16:41:42 -0500 Subject: [PATCH] Rename elastic bootstrap password setting (elastic/x-pack-elasticsearch#2009) This is related to elastic/x-pack-elasticsearch#1991. Original commit: elastic/x-pack-elasticsearch@b265211e4a5cade43a3a88a61e7e3cb8ed3e0a62 --- plugin/build.gradle | 4 ++-- .../xpack/security/authc/esnative/ReservedRealm.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugin/build.gradle b/plugin/build.gradle index 5cc8168d501..4975e643b97 100644 --- a/plugin/build.gradle +++ b/plugin/build.gradle @@ -201,7 +201,7 @@ integTestCluster { setting 'xpack.monitoring.exporters._local.type', 'local' setting 'xpack.monitoring.exporters._local.enabled', 'false' setting 'xpack.monitoring.collection.interval', '-1' - keystoreSetting 'es.bootstrap.passwd.elastic', 'x-pack-test-password' + keystoreSetting 'bootstrap.password', 'x-pack-test-password' distribution = 'zip' // this is important since we use the reindex module in ML setupCommand 'setupTestUser', 'bin/x-pack/users', 'useradd', 'x_pack_rest_user', '-p', 'x-pack-test-password', '-r', 'superuser' @@ -325,5 +325,5 @@ run { setting 'xpack.security.enabled', 'true' setting 'xpack.monitoring.enabled', 'true' setting 'xpack.watcher.enabled', 'true' - keystoreSetting 'es.bootstrap.passwd.elastic', 'password' + keystoreSetting 'bootstrap.password', 'password' } diff --git a/plugin/src/main/java/org/elasticsearch/xpack/security/authc/esnative/ReservedRealm.java b/plugin/src/main/java/org/elasticsearch/xpack/security/authc/esnative/ReservedRealm.java index 89bc04727c1..6127c064f89 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/security/authc/esnative/ReservedRealm.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/security/authc/esnative/ReservedRealm.java @@ -56,7 +56,7 @@ public class ReservedRealm extends CachingUsernamePasswordRealm { public static final Setting ACCEPT_DEFAULT_PASSWORD_SETTING = Setting.boolSetting( Security.setting("authc.accept_default_password"), true, Setting.Property.NodeScope, Setting.Property.Filtered, Setting.Property.Deprecated); - public static final Setting BOOTSTRAP_ELASTIC_PASSWORD = SecureSetting.secureString("es.bootstrap.passwd.elastic", null); + public static final Setting BOOTSTRAP_ELASTIC_PASSWORD = SecureSetting.secureString("bootstrap.password", null); private final NativeUsersStore nativeUsersStore; private final AnonymousUser anonymousUser;