Added flag to give choice of using PPA repository.

AnsibleShipyard · Sep 4, 2015 · efe3d1b · efe3d1b
1 parent 318b812
commit efe3d1b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -15,6 +15,6 @@ Java Playbook for Ansible
 
 This playbook will install Java OpenJDK.
 
-It uses the [ppa:openjdk-r/ppa](https://launchpad.net/~openjdk-r/+archive/ubuntu/ppa) repository for Ubuntu, to add backports of Java OpenJDK 8.
+It optionally uses the [ppa:openjdk-r/ppa](https://launchpad.net/~openjdk-r/+archive/ubuntu/ppa) repository for Ubuntu, to add backports of Java, for example OpenJDK 8 on Ubuntu 14.04. Set `use_openjdk_ppa: true` to use the repo.
 
 Support open source!
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -2,3 +2,4 @@
 java_version: "7"
 java_register_alternative: false
 java_register_env: false
+use_openjdk_ppa: false
diff --git a/tasks/Debian.yml b/tasks/Debian.yml
@@ -1,6 +1,6 @@
 - name: Add Ubuntu OpenJDK repo (for additional Java versions)
   apt_repository: repo='ppa:openjdk-r/ppa' state=present
-  when: ansible_lsb.id == 'Ubuntu'
+  when: ansible_lsb.id == 'Ubuntu' and use_openjdk_ppa
 
 - name: Install os packages
   apt: