Update JJG-Ansible-Windows sub-project to latest release (1.0.3).

Author: geerlingguy

provisioning/JJG-Ansible-Windows/README.md

@@ -2,7 +2,7 @@
 
 Windows shell provisioning script to bootstrap Ansible from within a Vagrant VM running on Windows.
 
-This script is configured to use configure RHEL-based VM (Fedora, CentOS, etc.) so it can run Ansible playbooks from within the VM through Vagrant.
+This script is configured to use configure any Linux-based VM (Debian, Ubuntu, Fedora, RedHat, CentOS, etc.) so it can run Ansible playbooks from within the VM through Vagrant.
 
 Read more about this script, and other techniques for using Ansible within a Windows environment, on Server Check.in: [Running Ansible within Windows](https://servercheck.in/blog/running-ansible-within-windows).
 

provisioning/JJG-Ansible-Windows/windows.sh

@@ -10,31 +10,32 @@
 # export {http,https,ftp}_proxy='http://username:password@proxy-host:80'
 
 ANSIBLE_PLAYBOOK=$1
+PLAYBOOK_DIR=${ANSIBLE_PLAYBOOK%/*}
 
 # Detect package management system.
-YUM=$(which yum)
-APT_GET=$(which apt-get)
+YUM=$(which yum 2>/dev/null)
+APT_GET=$(which apt-get 2>/dev/null)
 
 # Make sure Ansible playbook exists.
-if [ ! -f /vagrant/$ANSIBLE_PLAYBOOK ]; then
+if [ ! -f "/vagrant/$ANSIBLE_PLAYBOOK" ]; then
   echo "Cannot find Ansible playbook."
   exit 1
 fi
 
 # Install Ansible and its dependencies if it's not installed already.
 if [ ! -f /usr/bin/ansible ]; then
   echo "Installing Ansible dependencies and Git."
-  if [[ ! -z $YUM ]]; then
+  if [[ ! -z ${YUM} ]]; then
     yum install -y git python python-devel
-  elif [[ ! -z $APT_GET ]]; then
-    apt-get install -y git python python-devel
+  elif [[ ! -z ${APT_GET} ]]; then
+    apt-get install -y git python python-dev
   else
     echo "Neither yum nor apt-get are available."
     exit 1;
   fi
 
   echo "Installing pip via easy_install."
-  wget http://peak.telecommunity.com/dist/ez_setup.py
+  wget https://raw.githubusercontent.com/ActiveState/ez_setup/v0.9/ez_setup.py
   python ez_setup.py && rm -f ez_setup.py
   easy_install pip
   # Make sure setuptools are installed crrectly.
@@ -47,13 +48,10 @@ if [ ! -f /usr/bin/ansible ]; then
   pip install ansible
 fi
 
-# Install Ansible roles from requirements file, if available.
-if [ -f /vagrant/requirements.txt ]; then
-  sudo ansible-galaxy install -r /vagrant/requirements.txt
-elif [-f /vagrant/requirements.yml ]; then
-  sudo ansible-galaxy install -r /vagrant/requirements.yml
-fi
+# Install requirements.
+echo "Installing Ansible roles from requirements file, if available."
+find "/vagrant/$PLAYBOOK_DIR" \( -name "requirements.yml" -o -name "requirements.txt" \) -exec sudo ansible-galaxy install -r {} \;
 
 # Run the playbook.
 echo "Running Ansible provisioner defined in Vagrantfile."
-ansible-playbook -i 'localhost,' /vagrant/${ANSIBLE_PLAYBOOK} --extra-vars "is_windows=true" --connection=local
+ansible-playbook -i 'localhost,' "/vagrant/${ANSIBLE_PLAYBOOK}" --extra-vars "is_windows=true" --connection=local