From fcd0d19bb38c2365d8f46b993ee411a56c22ae94 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Thu, 21 Apr 2016 13:06:43 -0500 Subject: [PATCH] Issue #1: Fix Ansible install/uninstall since PPA doesn't exist yet. --- scripts/ansible.sh | 20 +++++++++++++++----- scripts/cleanup.sh | 9 +++++++-- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/scripts/ansible.sh b/scripts/ansible.sh index c173dd9..189f62e 100644 --- a/scripts/ansible.sh +++ b/scripts/ansible.sh @@ -1,10 +1,20 @@ #!/bin/bash -eux +# Install pip. +apt -y install python-setuptools python-dev +easy_install pip + +# Install Ansible. +pip install ansible + +# TODO: Switch to official apt repo after the following issue is resolved: +# https://github.com/ansible/ansible/issues/15524 + # Install Ansible repository. -apt -y update && apt-get -y upgrade -apt -y install software-properties-common -apt-add-repository ppa:ansible/ansible +# apt -y update && apt-get -y upgrade +# apt -y install software-properties-common +# apt-add-repository ppa:ansible/ansible # Install Ansible. -apt -y update -apt -y install ansible +# apt -y update +# apt -y install ansible diff --git a/scripts/cleanup.sh b/scripts/cleanup.sh index 60a35a1..29b7a22 100644 --- a/scripts/cleanup.sh +++ b/scripts/cleanup.sh @@ -1,8 +1,13 @@ #!/bin/bash -eux # Uninstall Ansible and remove PPA. -apt -y remove --purge ansible -apt-add-repository --remove ppa:ansible/ansible +# apt -y remove --purge ansible +# apt-add-repository --remove ppa:ansible/ansible + +# Uninstall Ansible. +pip uninstall ansible + +# Apt cleanup. apt autoremove apt update