2.x only have 2.x opensearch/dashboards apps (#65)

* 2.x only have 2.x opensearch/dashboards apps #64 Signed-off-by: Peter Zhu <[email protected]> * Update readme Signed-off-by: Peter Zhu <[email protected]> * Remove dco Signed-off-by: Peter Zhu <[email protected]> * Small Tweaks Signed-off-by: Peter Zhu <[email protected]>
opensearch-project · May 26, 2022 · 2e53343 · 2e53343
1 parent 39184ae
commit 2e53343
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 24 deletions.
diff --git a/.github/workflows/dco.yml b/.github/workflows/dco.yml
diff --git a/README.md b/README.md
@@ -13,6 +13,16 @@
 
 A community repository for Ansible Playbook of OpenSearch Project.
 
+## Version and Branching
+As of now, this ansible-playbook repository maintains 2 branches:
+* _main_ (Version is 2.x.x for both `os_version` and `os_dashboards_version` in `inventories/opensearch/group_vars/all/all.yml`)
+* _1.x_ (Version is 1.x.x for both `os_version` and `os_dashboards_version` in `inventories/opensearch/group_vars/all/all.yml`)
+<br>
+
+Contributors should choose the corresponding branch(es) when commiting their change(s):
+* If you have a change for a specific version, only open PR to specific branch
+* If you have a change for all available versions, first open a PR on `main`, then open a backport PR with `[backport 1.x]` in the title, with label `backport 1.x`, etc.
+
 ## OpenSearch Installation with Dashboards
 
 This ansible playbook supports the following,

diff --git a/inventories/opensearch/group_vars/all/all.yml b/inventories/opensearch/group_vars/all/all.yml
@@ -6,16 +6,12 @@ os_cluster_name: development-cluster
 os_download_url: https://artifacts.opensearch.org/releases/bundle/opensearch
 
 # opensearch version
-# 1.x Latest Version
-os_version: "1.3.2"
 # 2.x Latest Version
-# os_version: "2.0.0-rc1"
+os_version: "2.0.0"
 
 # opensearch dashboards version
-# 1.x Latest Version
-os_dashboards_version: "1.3.2"
 # 2.x Latest Version
-# os_dashboards_version: "2.0.0-rc1"
+os_dashboards_version: "2.0.0"
 
 # Configure hostnames for opensearch nodes
 # It is required to configure SSL