From 27ebea8f9c89f93bd6d2d7d1177775a9346edb4e Mon Sep 17 00:00:00 2001 From: alemazz Date: Wed, 23 Dec 2015 14:11:14 +0100 Subject: [PATCH 1/5] add RH compatibility to Ansible installation scripts --- scripts/install-ansible.sh | 102 +++++++++++++++++++++++++------------ 1 file changed, 70 insertions(+), 32 deletions(-) diff --git a/scripts/install-ansible.sh b/scripts/install-ansible.sh index 2ed6b82..eb8d9f7 100755 --- a/scripts/install-ansible.sh +++ b/scripts/install-ansible.sh @@ -1,34 +1,72 @@ #!/bin/bash -export DEBIAN_FRONTEND=noninteractive -export PYTHONUNBUFFERED=1 - -sudo apt-get update - -printf '**************************\n\n' -printf 'Install cachefilesd' -printf '**************************\n\n' -# NFS improve caching -sudo apt-get install cachefilesd -sudo echo "RUN=yes" > /etc/default/cachefilesd -sudo service cachefilesd start -printf '**************************\n\n' -printf 'Finish install cachefilesd' -printf '**************************\n\n' - -printf '**************************\n\n' -printf 'Install ansible' -printf '**************************\n\n' -sudo apt-get install -y python-pip python-dev python-pycurl -sudo pip install ansible - -sudo mkdir -p /etc/ansible - -printf '**************************\n\n' -printf 'Removes executable permission on hosts.ini to avoid ansible evalute this inventory like external scritp' -chmod -x $1/provisioning/hosts.ini -printf '**************************\n\n' - -printf '**************************\n\n' -printf 'Finish install ansible' -printf '**************************\n\n' +if [ -f /etc/centos-release]; then + + export PYTHONUNBUFFERED=1 + yum install wget + wget https://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-5.noarch.rpm + sudo yum -y install epel-release-7-5.noarch.rpm + sudo yum --enablerepo="epel" + sudo yum update + + printf '**************************\n\n' + printf 'Install cachefilesd' + printf '**************************\n\n' + #NFS improve caching + sudo yum -y install cachefilesd + sudo echo "RUN=yes" > /etc/default/cachefilesd + sudo service cachefilesd start + printf '**************************\n\n' + printf 'Finish install cachefilesd' + printf '**************************\n\n' + + printf '**************************\n\n' + printf 'Install ansible' + printf '**************************\n\n' + sudo yum install -y python-pip python-devel python-pycurl ansible + sudo mkdir -p /etc/ansible + + printf '**************************\n\n' + printf 'Removes executable permission on hosts.ini to avoid ansible evalute this inventory like external scritp' + chmod -x $1/provisioning/hosts.ini + printf '**************************\n\n' + + printf '**************************\n\n' + printf 'Finish install ansible' + printf '**************************\n\n' + +else + + export DEBIAN_FRONTEND=noninteractive + export PYTHONUNBUFFERED=1 + + sudo apt-get update + + printf '**************************\n\n' + printf 'Install cachefilesd' + printf '**************************\n\n' + # NFS improve caching + sudo apt-get install cachefilesd + sudo echo "RUN=yes" > /etc/default/cachefilesd + sudo service cachefilesd start + printf '**************************\n\n' + printf 'Finish install cachefilesd' + printf '**************************\n\n' + + printf '**************************\n\n' + printf 'Install ansible' + printf '**************************\n\n' + sudo apt-get install -y python-pip python-dev python-pycurl + sudo pip install ansible + + sudo mkdir -p /etc/ansible + + printf '**************************\n\n' + printf 'Removes executable permission on hosts.ini to avoid ansible evalute this inventory like external scritp' + chmod -x $1/provisioning/hosts.ini + printf '**************************\n\n' + + printf '**************************\n\n' + printf 'Finish install ansible' + printf '**************************\n\n' +fi From b512f163bb6fdec2cb2da5068dbf5961d8203b4e Mon Sep 17 00:00:00 2001 From: alemazz Date: Wed, 23 Dec 2015 14:12:01 +0100 Subject: [PATCH 2/5] add RH compatibility to Ansible installation scripts --- scripts/run-ansible.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/run-ansible.sh b/scripts/run-ansible.sh index 0bbc0dc..cb443ff 100755 --- a/scripts/run-ansible.sh +++ b/scripts/run-ansible.sh @@ -1,8 +1,4 @@ #!/bin/bash -export DEBIAN_FRONTEND=noninteractive -export PYTHONUNBUFFERED=1 - -echo Running ansible playbooks as local ansible-playbook $1/provisioning/playbooks.yml -i $1/provisioning/hosts.ini --extra-vars="target=development target_user=vagrant" --connection=local From fdd6f8fb19a84b42f860f744690a9d718f869b12 Mon Sep 17 00:00:00 2001 From: alemazz Date: Wed, 23 Dec 2015 14:26:02 +0100 Subject: [PATCH 3/5] add RH compatibility to Ansible installation scripts --- scripts/install-ansible.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install-ansible.sh b/scripts/install-ansible.sh index eb8d9f7..a548f6c 100755 --- a/scripts/install-ansible.sh +++ b/scripts/install-ansible.sh @@ -1,6 +1,6 @@ #!/bin/bash -if [ -f /etc/centos-release]; then +if [ -f /etc/centos-release ]; then export PYTHONUNBUFFERED=1 yum install wget From 54e88bfc4be05813f209ea72de486a2d3c33bd5d Mon Sep 17 00:00:00 2001 From: alemazz Date: Wed, 23 Dec 2015 14:34:08 +0100 Subject: [PATCH 4/5] add RH compatibility to Ansible installation scripts --- scripts/install-ansible.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install-ansible.sh b/scripts/install-ansible.sh index a548f6c..e7a64ed 100755 --- a/scripts/install-ansible.sh +++ b/scripts/install-ansible.sh @@ -7,7 +7,7 @@ if [ -f /etc/centos-release ]; then wget https://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-5.noarch.rpm sudo yum -y install epel-release-7-5.noarch.rpm sudo yum --enablerepo="epel" - sudo yum update + sudo yum -y update printf '**************************\n\n' printf 'Install cachefilesd' From 77bd4e3613292479f5a14dd10347af3c4fc80a38 Mon Sep 17 00:00:00 2001 From: alemazz Date: Wed, 23 Dec 2015 14:35:26 +0100 Subject: [PATCH 5/5] add RH compatibility to Ansible installation scripts --- scripts/install-ansible.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install-ansible.sh b/scripts/install-ansible.sh index e7a64ed..5b832c3 100755 --- a/scripts/install-ansible.sh +++ b/scripts/install-ansible.sh @@ -3,7 +3,7 @@ if [ -f /etc/centos-release ]; then export PYTHONUNBUFFERED=1 - yum install wget + yum -y install wget wget https://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-5.noarch.rpm sudo yum -y install epel-release-7-5.noarch.rpm sudo yum --enablerepo="epel"