Use final 6.3.0 release instead of snapshot

defaults/main.yml

@@ -1,15 +1,15 @@
 ---
-es_use_snapshot_release: true # TODO remove when 6.3 is released
 es_major_version: "6.x"
 es_version: "6.3.0"
+es_use_snapshot_release: false
 es_enable_xpack: true
 es_package_name: "elasticsearch"
 es_version_lock: false
 es_use_repository: true
 es_templates_fileglob: "files/templates/*.json"
 es_apt_key: "https://artifacts.elastic.co/GPG-KEY-elasticsearch"
-es_apt_url: "deb https://artifacts.elastic.co/packages/{{ es_major_version }}/apt stable main"
-es_apt_url_old: "deb http://packages.elastic.co/elasticsearch/{{ es_major_version }}/debian stable main"
+es_apt_url: "deb https://artifacts.elastic.co/packages/{{ es_repo_name }}/apt stable main"
+es_apt_url_old: "deb http://packages.elastic.co/elasticsearch/{{ es_repo_name }}/debian stable main"
 es_start_service: true
 es_java_install: true
 update_java: false

tasks/elasticsearch-RedHat.yml

@@ -6,7 +6,7 @@
 
 - name: RedHat - add Elasticsearch repo
   become: yes
-  template: src=elasticsearch.repo dest=/etc/yum.repos.d/elasticsearch-{{ es_major_version }}.repo
+  template: src=elasticsearch.repo dest=/etc/yum.repos.d/elasticsearch-{{ es_repo_name }}.repo
   when: es_use_repository
 
 - name: RedHat - include versionlock

templates/elasticsearch.repo

@@ -1,6 +1,6 @@
-[elasticsearch-{{ es_major_version }}]
-name=Elasticsearch repository for {{ es_major_version }} packages
-baseurl=https://artifacts.elastic.co/packages/{{ es_major_version }}/yum
+[elasticsearch-{{ es_repo_name }}]
+name=Elasticsearch repository for {{ es_repo_name }} packages
+baseurl=https://artifacts.elastic.co/packages/{{ es_repo_name }}/yum
 gpgcheck=1
 gpgkey=https://artifacts.elastic.co/GPG-KEY-elasticsearch
 enabled=1

test/integration/xpack.yml

@@ -11,7 +11,6 @@
     es_heap_size: "1g"
     es_templates: true
     es_version: "{{ '6.2.4' if es_major_version == '6.x' else '5.6.6' }}" # This is set to an older version than the current default to force an upgrade
-    es_use_snapshot_release: false # TODO remove when 6.3 is released
     es_enable_xpack: true
     es_xpack_license: "{{ lookup('file', '/tmp/license.json')  }}"
     es_plugins:

vars/main.yml

@@ -9,3 +9,4 @@ reserved_xpack_users: ["elastic","kibana","logstash_system"]
 
 # X-Pack used to be installed as a plugin. For versions after 6.3 we don't need to install it anymore
 es_install_xpack: "{{ true if ( es_version | version_compare('6.3.0', '<')) else false }}"
+es_repo_name: "{{ 'oss-' + es_major_version if (( es_version | version_compare('6.3.0', '>=')) and not es_enable_xpack ) else es_major_version }}"