Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Install CA Certificates after installing OpenJDK #27

Merged
merged 2 commits into from
Aug 22, 2017

Conversation

tnation14
Copy link
Contributor

@tnation14 tnation14 commented Aug 22, 2017

Fixes a ca-certificates-java bug where installing OpenJDK does not install Java SSL certificates.

Closes #26
Connects WikiWatershed/model-my-watershed#2167

Testing

diff --git a/deployment/ansible/roles.yml b/deployment/ansible/roles.yml
index 714c97a8..73ca45ca 100644
--- a/deployment/ansible/roles.yml
+++ b/deployment/ansible/roles.yml
@@ -44,7 +44,10 @@
   version: 0.1.0
 - src: azavea.beaver
   version: 1.0.1
-- src: azavea.java
-  version: 0.5.0
+
+- name: azavea.java 
+  src: git+https://github.com/azavea/ansible-java.git
+  version: origin/feature/tnation/install-cacerts
+  
 - src: azavea.docker
   version: 1.0.2
diff --git a/vagrant/ansible_galaxy_helper.rb b/vagrant/ansible_galaxy_helper.rb
index 6e14f858..ad95257d 100644
--- a/vagrant/ansible_galaxy_helper.rb
+++ b/vagrant/ansible_galaxy_helper.rb
@@ -18,7 +18,7 @@ module AnsibleGalaxyHelper
     ansible_roles_spec = File.join(ansible_directory, "roles.yml")
 
     YAML.load_file(ansible_roles_spec).each do |role|
-      role_name = role["src"]
+      role_name = role["name"] ? role["name"] : role["src"]
       role_version = role["version"]      
       role_path = File.join(ansible_directory, "roles", role_name)
       galaxy_metadata = galaxy_install_info(role_path)

@tnation14 tnation14 self-assigned this Aug 22, 2017
@tnation14 tnation14 changed the title Feature/tnation/install cacerts Install CA Certificates after installing OpenJDK Aug 22, 2017
@rajadain
Copy link

Trying this out in MMW now

Copy link
Contributor

@hectcastro hectcastro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This aligns with a similar fix in the OpenJDK Docker images. :\

Copy link

@rajadain rajadain left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 tested with MMW, works there. I could not get molecule to install on my machine though, but I'll take your word for the passing tests. Thanks for adding this! 👍

@tnation14 tnation14 merged commit d604128 into develop Aug 22, 2017
@tnation14 tnation14 deleted the feature/tnation/install-cacerts branch August 22, 2017 20:57
rajadain added a commit to WikiWatershed/model-my-watershed that referenced this pull request Aug 22, 2017
We need azavea/ansible-java#27 to solve
AWS access issues with OpenJDK.
mmcfarland pushed a commit to WikiWatershed/model-my-watershed that referenced this pull request Aug 31, 2017
We need azavea/ansible-java#27 to solve
AWS access issues with OpenJDK.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants