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

Commit 361c44e

Browse files
author
Yuriy
authored
Rename master - main (#828)
* Rename master - main * master - main
1 parent ffcb0b2 commit 361c44e

File tree

6 files changed

+20
-20
lines changed

6 files changed

+20
-20
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
22
- job:
3-
name: elastic+ansible-elasticsearch+master-6x
4-
display-name: elastic / ansible-elasticsearch - master - 6.x
5-
description: Master branch testing with test kitchen for Elasticsearch 6.x
3+
name: elastic+ansible-elasticsearch+main-6x
4+
display-name: elastic / ansible-elasticsearch - main - 6.x
5+
description: Main branch testing with test kitchen for Elasticsearch 6.x
66
parameters:
77
- string:
88
name: branch_specifier
9-
default: master
9+
default: main
1010
description: the Git branch specifier to build (<branchName>, <tagName>,
1111
<commitId>, etc.)
1212
- string:

.ci/jobs/elastic+ansible-elasticsearch+master.yml renamed to .ci/jobs/elastic+ansible-elasticsearch+main.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
22
- job:
3-
name: elastic+ansible-elasticsearch+master
4-
display-name: elastic / ansible-elasticsearch - master
5-
description: Master branch testing with test kitchen
3+
name: elastic+ansible-elasticsearch+main
4+
display-name: elastic / ansible-elasticsearch - main
5+
description: Main branch testing with test kitchen
66
parameters:
77
- string:
88
name: branch_specifier
9-
default: master
9+
default: main
1010
description: the Git branch specifier to build (<branchName>, <tagName>,
1111
<commitId>, etc.)
1212
- string:

.github/issue_template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Issues that do not follow these guidelines are likely to be closed.
2424

2525
**Elasticsearch version**
2626

27-
**Role version**: (If using master please specify github sha)
27+
**Role version**: (If using main please specify github sha)
2828

2929
**JVM version** (`java -version`):
3030

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ You can now override the configuration files with your own versions by using the
300300

301301
### SSL/TLS Support
302302

303-
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.
303+
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.
304304

305305
| PR | Author | Title |
306306
|-------------------------------------------------------------------|------------------------------------------------|----------------------------------------------|

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ansible-elasticsearch
2-
[![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/)
2+
[![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/)
33
[![Ansible Galaxy](https://img.shields.io/badge/ansible--galaxy-elastic.elasticsearch-blue.svg)](https://galaxy.ansible.com/elastic/elasticsearch/)
44

55
**THIS ROLE IS FOR 7.x & 6.x**
@@ -23,8 +23,8 @@ The latest Elasticsearch versions of 7.x & 6.x are actively tested.
2323

2424
### Notice about multi-instance support
2525

26-
* 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)
27-
* 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.
26+
* 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)
27+
* 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.
2828
* 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).
2929

3030
### Removing the MAX_THREAD settings
@@ -89,8 +89,8 @@ The simplest configuration therefore consists of:
8989
The above installs Elasticsearch 7.15.1 in a single node 'node1' on the hosts 'localhost'.
9090
9191
**Note**:
92-
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.
93-
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.
92+
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.
93+
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.
9494

9595
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.
9696

@@ -400,7 +400,7 @@ If you don't have a license you can enable the 30-day trial by setting `es_xpack
400400

401401
X-Pack configuration parameters can be added to the elasticsearch.yml file using the normal `es_config` parameter.
402402

403-
For a full example see [here](https://github.com/elastic/ansible-elasticsearch/blob/master/test/integration/xpack-upgrade.yml)
403+
For a full example see [here](https://github.com/elastic/ansible-elasticsearch/blob/main/test/integration/xpack-upgrade.yml)
404404

405405
#### Important Note for Native Realm Configuration
406406

@@ -413,7 +413,7 @@ These can either be set to a user declared in the file based realm, with admin p
413413

414414
#### X-Pack Security SSL/TLS
415415

416-
* 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)
416+
* 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)
417417

418418

419419
### Additional Configuration
@@ -499,7 +499,7 @@ es_keystore_entries:
499499

500500

501501

502-
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.
502+
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.
503503

504504
### Proxy
505505

tasks/compatibility-variables.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# It is possible to set these are defaults with messy jinja templating one liners however:
44
# 1. That is really hard to read and debug
55
# 2. When running multiple plays with the same role the defaults are not re-evaluated. An example of this
6-
# can be seen in our the https://github.com/elastic/ansible-elasticsearch/blob/master/test/integration/xpack.yml
7-
# integration test and in the Multi Node server documentation examples https://github.com/elastic/ansible-elasticsearch/blob/master/test/integration/xpack.yml
6+
# can be seen in our the https://github.com/elastic/ansible-elasticsearch/blob/main/test/integration/xpack.yml
7+
# integration test and in the Multi Node server documentation examples https://github.com/elastic/ansible-elasticsearch/blob/main/test/integration/xpack.yml
88
- name: Set backward compatibility for deprecated es_enable_xpack variable
99
when: es_enable_xpack is defined and not es_enable_xpack
1010
block:

0 commit comments

Comments
 (0)