]> git.apps.os.sepia.ceph.com Git - ceph-build.git/commitdiff
remove unneeded ansible playbooks and pip install chacractl 140/head
authorAndrew Schoen <aschoen@redhat.com>
Tue, 20 Oct 2015 20:38:42 +0000 (15:38 -0500)
committerAndrew Schoen <aschoen@redhat.com>
Tue, 20 Oct 2015 20:43:01 +0000 (15:43 -0500)
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
ceph-build-next/build/setup
ceph-build-next/setup/playbooks/setup.yml [deleted file]
ceph-build-next/setup/playbooks/tasks/main.yml [deleted file]

index 52ac3a8afc4fef8b61a900ea27dd9244f7e26b78..f353f0a775a2383a0f1f8687ed5cc05063e05ec2 100644 (file)
@@ -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 (file)
index b545ad4..0000000
+++ /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 (file)
index 9f2e211..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
----
-- debug: msg="testing"
-
-#TODO: write ~/.chacractl config file
-#TODO: install chacractl from pypi