Skip to content
This repository has been archived by the owner on Jun 24, 2022. It is now read-only.

[xpack] use elasticsearch default xpack features #560

Merged
merged 19 commits into from
May 29, 2019

Conversation

jmlrt
Copy link
Member

@jmlrt jmlrt commented May 10, 2019

  • Stop forcing es_xpack_features variable in order to let elasticsearch install default features described in http://localhost:9200/_xpack
  • Change xpack test scope to be able to test default xpack install
    • xpack scenario will test xpack install with default features
    • xpack upgrade scenario will fully test security feature
    • oss-to-xpack-upgrade will test installing only other specific features
  • Cleanup some duplicate serverspec tests
  • Remove system_keyfeature (deprecated in 5.6 and removed in 6.0 - Breaking Changes 6.0.0)
  • Cleanup some ansible code (especially in when conditions)

stop forcing es_xpack_features variable in order to let elasticsearch install default features described in http://localhost:9200/_xpack
@jmlrt jmlrt self-assigned this May 10, 2019
@jmlrt jmlrt mentioned this pull request May 16, 2019
@jmlrt jmlrt requested a review from Crazybus May 17, 2019 19:33
Crazybus
Crazybus previously approved these changes May 28, 2019
Copy link
Contributor

@Crazybus Crazybus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

Made a few suggestions on some improvements but are out of scope for this change.

tasks/main.yml Outdated Show resolved Hide resolved
tasks/xpack/elasticsearch-xpack.yml Show resolved Hide resolved
tasks/xpack/security/elasticsearch-security.yml Outdated Show resolved Hide resolved
defaults/main.yml Show resolved Hide resolved
jmlrt added 4 commits May 28, 2019 19:26
We should use default value by default which will be same default value as xpack features. these values can still be forced in `es_config`. The only one we should keep is `xpack.security.enabled`which should be forced to true if a username and password are configured
- xpack scenario will test xpack install with default features
- xpack upgrade scenario will fully test security feature
- oss-to-xpack-upgrade will test installing only other specific features
All these tests are already in `shared_spec` test
@jmlrt jmlrt requested a review from Crazybus May 29, 2019 09:39
Crazybus
Crazybus previously approved these changes May 29, 2019
Copy link
Contributor

@Crazybus Crazybus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@@ -20,4 +21,4 @@
- name: Set elasticsearch.keystore Permissions
become: yes
file: state=file path={{ conf_dir }}/elasticsearch.keystore owner={{ es_user }} group={{ es_group }}
when: es_enable_xpack and es_xpack_features is defined and "security" in es_xpack_features and (es_version is version_compare('6.0.0', '>'))
when: es_enable_xpack
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we always want to do this even when using the oss version. But it was apparently already like this so its out of scope. I also think that the package properly creates the keystore with the correct permissions now but would need to confirm

tasks/xpack/security/elasticsearch-xpack-activation.yml Outdated Show resolved Hide resolved
Copy link
Contributor

@Crazybus Crazybus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants