From: Sébastien Han <seb@redhat.com>
Date: Tue, 9 Jun 2015 14:06:54 +0000 (+0200)
Subject: Rename bootstrap ansible to install
X-Git-Tag: v1.0.0~210^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1a9ddb5a26f7af730c87890626e558a56842d24d;p=ceph-ansible.git

Rename bootstrap ansible to install

The bootstrap was confusing.

Signed-off-by: Sébastien Han <seb@redhat.com>
---

diff --git a/bootstrap-ansible.sh b/bootstrap-ansible.sh
deleted file mode 100644
index 675097dff..000000000
--- a/bootstrap-ansible.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-if [[ $EUID -ne 0 ]]; then
-    echo "You are NOT running this script as root."
-    echo "You should."
-    echo "Really."
-    exit 1
-fi
-
-if [[ -x $(which lsb_release 2>/dev/null) ]]; then
-  os_VENDOR=$(lsb_release -i -s)
-  os_VERSION=$(lsb_release -c -s)
-  if [[ "Debian" =~ $os_VENDOR ]]; then
-    apt-get update
-    apt-get install python-pip python-dev git build-essential -y
-    pip install PyYAML jinja2 paramiko
-    git clone https://github.com/ansible/ansible.git
-    cd ansible
-    make install
-    mkdir /etc/ansible
-  elif [[ "Ubuntu" =~ $os_VENDOR ]]; then
-    if [[ "precise" =~ $os_VERSION ]]; then
-      add-apt-repository ppa:rquillo/ansible
-      apt-get update
-      apt-get install -y ansible
-    else
-      apt-get install -y ansible
-    fi
-  fi
-elif [[ -r /etc/redhat-release ]]; then
-  yum install -y ansible
-fi
diff --git a/install-ansible.sh b/install-ansible.sh
new file mode 100644
index 000000000..041c0e20c
--- /dev/null
+++ b/install-ansible.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+#
+# THIS SCRIPT INSTALLS ANSIBLE
+
+if [[ $EUID -ne 0 ]]; then
+    echo "You are NOT running this script as root."
+    echo "You should."
+    echo "Really."
+    exit 1
+fi
+
+if [[ -x $(which lsb_release 2>/dev/null) ]]; then
+  os_VENDOR=$(lsb_release -i -s)
+  os_VERSION=$(lsb_release -c -s)
+  if [[ "Debian" =~ $os_VENDOR ]]; then
+    apt-get update
+    apt-get install python-pip python-dev git build-essential -y
+    pip install PyYAML jinja2 paramiko
+    git clone https://github.com/ansible/ansible.git
+    cd ansible
+    make install
+    mkdir /etc/ansible
+  elif [[ "Ubuntu" =~ $os_VENDOR ]]; then
+    if [[ "precise" =~ $os_VERSION ]]; then
+      add-apt-repository ppa:rquillo/ansible
+      apt-get update
+      apt-get install -y ansible
+    else
+      apt-get install -y ansible
+    fi
+  fi
+elif [[ -r /etc/redhat-release ]]; then
+  yum install -y ansible
+fi