Rename master - main (#828)

* Rename master - main

* master - main

.ci/jobs/elastic+ansible-elasticsearch+main-6x.yml

@@ -1,12 +1,12 @@
 ---
 - job:
-    name: elastic+ansible-elasticsearch+master-6x
+    name: elastic+ansible-elasticsearch+main-6x
-    display-name: elastic / ansible-elasticsearch - master - 6.x
+    display-name: elastic / ansible-elasticsearch - main - 6.x
-    description: Master branch testing with test kitchen for Elasticsearch 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:

.ci/jobs/elastic+ansible-elasticsearch+main.yml

@@ -1,12 +1,12 @@
 ---
 - job:
-    name: elastic+ansible-elasticsearch+master
+    name: elastic+ansible-elasticsearch+main
-    display-name: elastic / ansible-elasticsearch - master
+    display-name: elastic / ansible-elasticsearch - main
-    description: Master branch testing with test kitchen
+    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:

.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`):
 

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                                        |
 |-------------------------------------------------------------------|------------------------------------------------|----------------------------------------------|

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 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/master/docs/multi-instance.md#workaround) instead.
+* 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.
+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/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.
+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
 

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
+# 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/master/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: