Skip to content

Fix some lint #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 20, 2023
Merged

Fix some lint #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e8ce827
Fix some lint
widhalmt Feb 16, 2023
891b918
Merge branch 'main' into fix/morelint
widhalmt Feb 17, 2023
98fc289
Fix triggers for actions
widhalmt Feb 20, 2023
4a63480
Improve idempotency
widhalmt Feb 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/test_role_logstash.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ on:
default: 'warning'
type: choice
options:
- info
- warning
- debug
- info
- warning
- debug
push:
branches:
- 'feature/**'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test_role_repos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ on:
default: 'warning'
type: choice
options:
- info
- warning
- debug
- info
- warning
- debug
push:
branches:
- 'feature/**'
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/test_roles_pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,14 @@
name: Test Collection Roles
on:
pull_request:
branches:
- 'main'
- 'feature/**'
- 'fix/**'
- '!doc/**'

merge_group:
types: [checks_requested]

jobs:
lint_full:
Expand Down
9 changes: 9 additions & 0 deletions roles/elasticsearch/tasks/elasticsearch-security.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
/usr/share/elasticsearch/bin/elasticsearch-keystore
add -x 'bootstrap.password'
when: "'bootstrap.password' not in es_keystore.stdout_lines"
changed_when: false
notify:
- Restart Elasticsearch
ignore_errors: "{{ ansible_check_mode }}"
Expand All @@ -54,6 +55,7 @@
echo "{{ elasticsearch_tls_key_passphrase }}" |
/usr/share/elasticsearch/bin/elasticsearch-keystore
add -f -x 'xpack.security.http.ssl.keystore.secure_password'
changed_when: false
when:
- http_ssl_keystore_secure_password.stdout is undefined or elasticsearch_tls_key_passphrase != http_ssl_keystore_secure_password.stdout
- elasticsearch_http_security
Expand All @@ -65,6 +67,7 @@
shell: >
/usr/share/elasticsearch/bin/elasticsearch-keystore
remove 'xpack.security.http.ssl.keystore.secure_password'
changed_when: false
when:
- "'xpack.security.http.ssl.keystore.secure_password' in es_keystore.stdout_lines"
- not elasticsearch_http_security
Expand All @@ -88,6 +91,7 @@
echo "{{ elasticsearch_tls_key_passphrase }}" |
/usr/share/elasticsearch/bin/elasticsearch-keystore
add -f -x 'xpack.security.http.ssl.truststore.secure_password'
changed_when: false
when:
- http_ssl_truststore_secure_password.stdout is undefined or elasticsearch_tls_key_passphrase != http_ssl_truststore_secure_password.stdout
- elasticsearch_http_security
Expand All @@ -98,6 +102,7 @@
shell: >
/usr/share/elasticsearch/bin/elasticsearch-keystore
remove 'xpack.security.http.ssl.truststore.secure_password'
changed_when: false
when:
- "'xpack.security.http.ssl.truststore.secure_password' in es_keystore.stdout_lines"
- not elasticsearch_http_security
Expand All @@ -121,6 +126,7 @@
echo "{{ elasticsearch_tls_key_passphrase }}" |
/usr/share/elasticsearch/bin/elasticsearch-keystore
add -f -x 'xpack.security.transport.ssl.keystore.secure_password'
changed_when: false
when:
- transport_ssl_keystore_secure_password.stdout is undefined or elasticsearch_tls_key_passphrase != transport_ssl_keystore_secure_password.stdout
- elasticsearch_security
Expand All @@ -131,6 +137,7 @@
shell: >
/usr/share/elasticsearch/bin/elasticsearch-keystore
remove 'xpack.security.transport.ssl.keystore.secure_password'
changed_when: false
when:
- "'xpack.security.transport.ssl.keystore.secure_password' in es_keystore.stdout_lines"
- not elasticsearch_security
Expand All @@ -154,6 +161,7 @@
echo "{{ elasticsearch_tls_key_passphrase }}" |
/usr/share/elasticsearch/bin/elasticsearch-keystore
add -f -x 'xpack.security.transport.ssl.truststore.secure_password'
changed_when: false
when:
- transport_ssl_truststore_secure_password.stdout is undefined or elasticsearch_tls_key_passphrase != transport_ssl_truststore_secure_password.stdout
- elasticsearch_security
Expand All @@ -164,6 +172,7 @@
shell: >
/usr/share/elasticsearch/bin/elasticsearch-keystore
remove 'xpack.security.transport.ssl.truststore.secure_password'
changed_when: false
when:
- "'xpack.security.transport.ssl.truststore.secure_password' in es_keystore.stdout_lines"
- not elasticsearch_security
Expand Down