Merge pull request #3768 from edx/derf/move_oraclejdk_into_relasticsearch_role

move oraclejdk into relasticsearch role

Merge pull request #3768 from edx/derf/move_oraclejdk_into_relasticsearch_role
move oraclejdk into relasticsearch role
b797db62 · Fred Smith · GitHub · db4211d6 · d004cdcd · b797db62
Commit b797db62 authored Mar 21, 2017 by Fred Smith Committed by GitHub Mar 21, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

playbooks/edx-east/elasticsearch.yml
+0 -1

playbooks/roles/elasticsearch/meta/main.yml
+1 -0

No files found.
--- a/playbooks/edx-east/elasticsearch.yml
+++ b/playbooks/edx-east/elasticsearch.yml
@@ -27,7 +27,6 @@
  roles:
    - common
    - aws
-    - oraclejdk
    - elasticsearch
  post_tasks:
    - debug:

--- a/playbooks/roles/elasticsearch/meta/main.yml
+++ b/playbooks/roles/elasticsearch/meta/main.yml
 ---
 dependencies:
  - common
+  - oraclejdk