Merge branch 'develop'

Author: proycon

bootstrap.sh

@@ -746,6 +746,12 @@ if [ -z "$SUDO" ]; then
 fi
 
 echo "Looking for dependencies..."
+if [[ "$OS" == "mac" ]]; then
+    if ! which brew; then
+        NEED+=("brew")
+    fi
+    #NEED+=("brew-cask")
+fi
 if [ $BUILD -eq 0 ]; then
     NEED_VIRTUALENV=0 #Do we need a virtualenv with ansible for the controller? Never needed if we are not building ourselves
 else
@@ -759,13 +765,11 @@ else
         if which ansible-playbook; then
             NEED_VIRTUALENV=0
         elif [ $SUDO -eq 1 ]; then #we can only install ansible globally if we have root
-            if [ "$OS" != "mac" ]; then #pip is preferred on mac
-                if [ "$DISTRIB_ID" = "centos" ] || [ "$DISTRIB_ID" = "rhel" ]; then
-                    NEED+=("epel") #ansible is in  EPEL
-                fi
-                NEED+=("ansible")
-                NEED_VIRTUALENV=0
+            if [ "$DISTRIB_ID" = "centos" ] || [ "$DISTRIB_ID" = "rhel" ]; then
+                NEED+=("epel") #ansible is in  EPEL
             fi
+            NEED+=("ansible")
+            NEED_VIRTUALENV=0
         fi
         if [ $NEED_VIRTUALENV -eq 1 ]; then
             if ! which pip; then
@@ -787,12 +791,6 @@ if [ -z "$EDITOR" ]; then
         EDITOR=vi
     fi
 fi
-if [[ "$OS" == "mac" ]]; then
-    if ! which brew; then
-        NEED+=("brew")
-    fi
-    #NEED+=("brew-cask")
-fi
 if [ ! -z "$NEED" ]; then
     echo " Missing dependencies: ${NEED[@]}"
 fi
@@ -1102,8 +1100,8 @@ for package in ${NEED[@]}; do
             cmd="sudo yum  $NONINTERACTIVEFLAGS install ansible"
         elif [ "$OS" = "arch" ]; then
             cmd="sudo pacman  $NONINTERACTIVEFLAGS -Sy ansible"
-        else
-            continue
+        elif [ "$OS" = "mac" ]; then
+            cmd="brew install ansible"
         fi
         echo "Ansible is required for LaMachine but not installed yet. ${bold}Install now?${normal}"
         if [ ! -z "$cmd" ]; then

roles/java-core/tasks/main.yml

@@ -5,15 +5,15 @@
           include_role:
             name: lamachine-package-install
           with_items:
-            - { debian: default-jdk, redhat: java-11-openjdk, arch: jdk-openjdk }
+            - { debian: default-11-jdk, redhat: java-11-openjdk, arch: jdk11-openjdk }
             - { debian: maven, redhat: maven, arch: maven } #not sure if this works on CentOS
           loop_control:
              loop_var: package
           when: root and (ansible_distribution|lower != "macosx")
 
         - name: Installing Java (Mac OS X)
           homebrew_cask:
-            name: java
+            name: java11
             state: present
           when: ansible_distribution|lower == "macosx"
 

roles/lamachine-core/tasks/macosx.yml

@@ -26,6 +26,10 @@
           fail:
              msg: "Your homebrew installation failed to install the base packages. This most likely means Homebrew on your system is in a broken state (possibly after an OS X update?). You will have to fix this first yourself prior to installing LaMachine."
 
+    - name: Homebrew, enabling cask versions
+      homebrew_tap:
+          name: homebrew/cask-versions
+
     - name: (Re)install virtualenv
       become: yes
       become_user: root