From 361c44ecbc635a21712ad830b61f65bae9ce8ad3 Mon Sep 17 00:00:00 2001 From: Yuriy <51912343+ygel@users.noreply.github.com> Date: Mon, 18 Oct 2021 11:38:17 -0500 Subject: [PATCH] Rename master - main (#828) * Rename master - main * master - main --- ...=> elastic+ansible-elasticsearch+main-6x.yml} | 8 ++++---- ...ml => elastic+ansible-elasticsearch+main.yml} | 8 ++++---- .github/issue_template.md | 2 +- CHANGELOG.md | 2 +- README.md | 16 ++++++++-------- tasks/compatibility-variables.yml | 4 ++-- 6 files changed, 20 insertions(+), 20 deletions(-) rename .ci/jobs/{elastic+ansible-elasticsearch+master-6x.yml => elastic+ansible-elasticsearch+main-6x.yml} (81%) rename .ci/jobs/{elastic+ansible-elasticsearch+master.yml => elastic+ansible-elasticsearch+main.yml} (83%) diff --git a/.ci/jobs/elastic+ansible-elasticsearch+master-6x.yml b/.ci/jobs/elastic+ansible-elasticsearch+main-6x.yml similarity index 81% rename from .ci/jobs/elastic+ansible-elasticsearch+master-6x.yml rename to .ci/jobs/elastic+ansible-elasticsearch+main-6x.yml index 969986b..4b73d88 100644 --- a/.ci/jobs/elastic+ansible-elasticsearch+master-6x.yml +++ b/.ci/jobs/elastic+ansible-elasticsearch+main-6x.yml @@ -1,12 +1,12 @@ --- - job: - name: elastic+ansible-elasticsearch+master-6x - display-name: elastic / ansible-elasticsearch - master - 6.x - description: Master branch testing with test kitchen for Elasticsearch 6.x + name: elastic+ansible-elasticsearch+main-6x + display-name: elastic / ansible-elasticsearch - main - 6.x + description: Main branch testing with test kitchen for Elasticsearch 6.x parameters: - string: name: branch_specifier - default: master + default: main description: the Git branch specifier to build (<branchName>, <tagName>, <commitId>, etc.) - string: diff --git a/.ci/jobs/elastic+ansible-elasticsearch+master.yml b/.ci/jobs/elastic+ansible-elasticsearch+main.yml similarity index 83% rename from .ci/jobs/elastic+ansible-elasticsearch+master.yml rename to .ci/jobs/elastic+ansible-elasticsearch+main.yml index 16ffc0c..f4848d2 100644 --- a/.ci/jobs/elastic+ansible-elasticsearch+master.yml +++ b/.ci/jobs/elastic+ansible-elasticsearch+main.yml @@ -1,12 +1,12 @@ --- - job: - name: elastic+ansible-elasticsearch+master - display-name: elastic / ansible-elasticsearch - master - description: Master branch testing with test kitchen + name: elastic+ansible-elasticsearch+main + display-name: elastic / ansible-elasticsearch - main + description: Main branch testing with test kitchen parameters: - string: name: branch_specifier - default: master + default: main description: the Git branch specifier to build (<branchName>, <tagName>, <commitId>, etc.) - string: diff --git a/.github/issue_template.md b/.github/issue_template.md index 2609e62..ef51586 100644 --- a/.github/issue_template.md +++ b/.github/issue_template.md @@ -24,7 +24,7 @@ Issues that do not follow these guidelines are likely to be closed. **Elasticsearch version** -**Role version**: (If using master please specify github sha) +**Role version**: (If using main please specify github sha) **JVM version** (`java -version`): diff --git a/CHANGELOG.md b/CHANGELOG.md index c2b5cc8..6320e0d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -300,7 +300,7 @@ You can now override the configuration files with your own versions by using the ### SSL/TLS Support -Ansible-elasticsearch is now supporting SSL/TLS encryption. Please refer to [X-Pack Security SSL/TLS](https://github.com/elastic/ansible-elasticsearch/blob/master/docs/ssl-tls-setup.md) to configure it. +Ansible-elasticsearch is now supporting SSL/TLS encryption. Please refer to [X-Pack Security SSL/TLS](https://github.com/elastic/ansible-elasticsearch/blob/main/docs/ssl-tls-setup.md) to configure it. | PR | Author | Title | |-------------------------------------------------------------------|------------------------------------------------|----------------------------------------------| diff --git a/README.md b/README.md index 3251422..10a31bd 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # ansible-elasticsearch -[![Build Status](https://img.shields.io/jenkins/s/https/devops-ci.elastic.co/job/elastic+ansible-elasticsearch+master.svg)](https://devops-ci.elastic.co/job/elastic+ansible-elasticsearch+master/) +[![Build Status](https://img.shields.io/jenkins/s/https/devops-ci.elastic.co/job/elastic+ansible-elasticsearch+main.svg)](https://devops-ci.elastic.co/job/elastic+ansible-elasticsearch+main/) [![Ansible Galaxy](https://img.shields.io/badge/ansible--galaxy-elastic.elasticsearch-blue.svg)](https://galaxy.ansible.com/elastic/elasticsearch/) **THIS ROLE IS FOR 7.x & 6.x** @@ -23,8 +23,8 @@ The latest Elasticsearch versions of 7.x & 6.x are actively tested. ### Notice about multi-instance support -* If you use only one instance but want to upgrade from an older ansible-elasticsearch version, follow [upgrade procedure](https://github.com/elastic/ansible-elasticsearch/blob/master/docs/multi-instance.md#upgrade-procedure) -* If you install more than one instance of Elasticsearch on the same host (with different ports, directory and config files), **do not update to ansible-elasticsearch >= 7.1.1**, please follow this [workaround](https://github.com/elastic/ansible-elasticsearch/blob/master/docs/multi-instance.md#workaround) instead. +* If you use only one instance but want to upgrade from an older ansible-elasticsearch version, follow [upgrade procedure](https://github.com/elastic/ansible-elasticsearch/blob/main/docs/multi-instance.md#upgrade-procedure) +* If you install more than one instance of Elasticsearch on the same host (with different ports, directory and config files), **do not update to ansible-elasticsearch >= 7.1.1**, please follow this [workaround](https://github.com/elastic/ansible-elasticsearch/blob/main/docs/multi-instance.md#workaround) instead. * For multi-instances use cases, we are now recommending Docker containers using our official images (https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html). ### Removing the MAX_THREAD settings @@ -89,8 +89,8 @@ The simplest configuration therefore consists of: The above installs Elasticsearch 7.15.1 in a single node 'node1' on the hosts 'localhost'. **Note**: -Elasticsearch default version is described in [`es_version`](https://github.com/elastic/ansible-elasticsearch/blob/master/defaults/main.yml#L2). You can override this variable in your playbook to install another version. -While we are testing this role only with one 7.x and one 6.x version (respectively [7.15.1](https://github.com/elastic/ansible-elasticsearch/blob/master/defaults/main.yml#L2) and [6.8.18](https://github.com/elastic/ansible-elasticsearch/blob/master/.kitchen.yml#L22) at the time of writing), this role should work with other versions also in most cases. +Elasticsearch default version is described in [`es_version`](https://github.com/elastic/ansible-elasticsearch/blob/main/defaults/main.yml#L2). You can override this variable in your playbook to install another version. +While we are testing this role only with one 7.x and one 6.x version (respectively [7.15.1](https://github.com/elastic/ansible-elasticsearch/blob/main/defaults/main.yml#L2) and [6.8.18](https://github.com/elastic/ansible-elasticsearch/blob/main/.kitchen.yml#L22) at the time of writing), this role should work with other versions also in most cases. This role also uses [Ansible tags](http://docs.ansible.com/ansible/playbooks_tags.html). Run your playbook with the `--list-tasks` flag for more information. @@ -400,7 +400,7 @@ If you don't have a license you can enable the 30-day trial by setting `es_xpack X-Pack configuration parameters can be added to the elasticsearch.yml file using the normal `es_config` parameter. -For a full example see [here](https://github.com/elastic/ansible-elasticsearch/blob/master/test/integration/xpack-upgrade.yml) +For a full example see [here](https://github.com/elastic/ansible-elasticsearch/blob/main/test/integration/xpack-upgrade.yml) #### Important Note for Native Realm Configuration @@ -413,7 +413,7 @@ These can either be set to a user declared in the file based realm, with admin p #### X-Pack Security SSL/TLS -* To configure your cluster with SSL/TLS for HTTP and/or transport communications follow the [SSL/TLS setup procedure](https://github.com/elastic/ansible-elasticsearch/blob/master/docs/ssl-tls-setup.md) +* To configure your cluster with SSL/TLS for HTTP and/or transport communications follow the [SSL/TLS setup procedure](https://github.com/elastic/ansible-elasticsearch/blob/main/docs/ssl-tls-setup.md) ### Additional Configuration @@ -499,7 +499,7 @@ es_keystore_entries: -This role ships with sample templates located in the [test/integration/files/templates-7.x](https://github.com/elastic/ansible-elasticsearch/tree/master/test/integration/files/templates-7.x) directory. `es_templates_fileglob` variable is used with the Ansible [with_fileglob](http://docs.ansible.com/ansible/playbooks_loops.html#id4) loop. When setting the globs, be sure to use an absolute path. +This role ships with sample templates located in the [test/integration/files/templates-7.x](https://github.com/elastic/ansible-elasticsearch/tree/main/test/integration/files/templates-7.x) directory. `es_templates_fileglob` variable is used with the Ansible [with_fileglob](http://docs.ansible.com/ansible/playbooks_loops.html#id4) loop. When setting the globs, be sure to use an absolute path. ### Proxy diff --git a/tasks/compatibility-variables.yml b/tasks/compatibility-variables.yml index 213d366..fc9af08 100644 --- a/tasks/compatibility-variables.yml +++ b/tasks/compatibility-variables.yml @@ -3,8 +3,8 @@ # It is possible to set these are defaults with messy jinja templating one liners however: # 1. That is really hard to read and debug # 2. When running multiple plays with the same role the defaults are not re-evaluated. An example of this -# can be seen in our the https://github.com/elastic/ansible-elasticsearch/blob/master/test/integration/xpack.yml -# integration test and in the Multi Node server documentation examples https://github.com/elastic/ansible-elasticsearch/blob/master/test/integration/xpack.yml +# can be seen in our the https://github.com/elastic/ansible-elasticsearch/blob/main/test/integration/xpack.yml +# integration test and in the Multi Node server documentation examples https://github.com/elastic/ansible-elasticsearch/blob/main/test/integration/xpack.yml - name: Set backward compatibility for deprecated es_enable_xpack variable when: es_enable_xpack is defined and not es_enable_xpack block: