From: Andrew Schoen <aschoen@redhat.com>
Date: Tue, 20 Oct 2015 20:38:42 +0000 (-0500)
Subject: remove unneeded ansible playbooks and pip install chacractl
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a031c33d92a29d8f3ba698ed322c005b8bdc847b;p=ceph-build.git

remove unneeded ansible playbooks and pip install chacractl

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
---

diff --git a/ceph-build-next/build/setup b/ceph-build-next/build/setup
index 52ac3a8a..f353f0a7 100644
--- a/ceph-build-next/build/setup
+++ b/ceph-build-next/build/setup
@@ -74,17 +74,9 @@ virtualenv venv
 PIP_SDIST_INDEX="$HOME/.cache/pip"
 mkdir -p $PIP_SDIST_INDEX
 
-# The setup for this job ensures that a copy of ceph-build will be available
-# for this script
-
 # Install the package by trying with the cache first, otherwise doing a download only, and then
 # trying to install from the cache again.
-if ! venv/bin/pip install --find-links="file://$PIP_SDIST_INDEX" --no-index ansible; then
-    venv/bin/pip install --exists-action=i --download-directory="$PIP_SDIST_INDEX" ansible
-    venv/bin/pip install --find-links="file://$PIP_SDIST_INDEX" --no-index ansible
+if ! venv/bin/pip install --find-links="file://$PIP_SDIST_INDEX" --no-index chacractl; then
+    venv/bin/pip install --exists-action=i --download-directory="$PIP_SDIST_INDEX" chacractl
+    venv/bin/pip install --find-links="file://$PIP_SDIST_INDEX" --no-index chacractl
 fi
-
-# run ansible to get this current host to meet our requirements, specifying
-# a local connection and 'localhost' as the host where to execute
-cd "$WORKSPACE/ceph-build/setup/playbooks"
-ansible-playbook -i "localhost," -c local setup.yml
diff --git a/ceph-build-next/setup/playbooks/setup.yml b/ceph-build-next/setup/playbooks/setup.yml
deleted file mode 100644
index b545ad4f..00000000
--- a/ceph-build-next/setup/playbooks/setup.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-
-- hosts: localhost
-  user: jenkins-build
-  sudo: True
-
-  tasks:
-     - include: tasks/main.yml
diff --git a/ceph-build-next/setup/playbooks/tasks/main.yml b/ceph-build-next/setup/playbooks/tasks/main.yml
deleted file mode 100644
index 9f2e211a..00000000
--- a/ceph-build-next/setup/playbooks/tasks/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-- debug: msg="testing"
-
-#TODO: write ~/.chacractl config file
-#TODO: install chacractl from pypi