From: Sébastien Han <sebastien.han@enovance.com>
Date: Wed, 21 Jan 2015 15:15:55 +0000 (+0100)
Subject: Fix Travis run
X-Git-Tag: v1.0.0~265^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=965df5579cdd1b241103f17df95eedb3d3d47dcd;p=ceph-ansible.git

Fix Travis run

Fix travis run and effectively test the playbooks.

Signed-off-by: Sébastien Han <sebastien.han@enovance.com>
---

diff --git a/.travis.yml b/.travis.yml
index 00eac3abb..15468e179 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,14 +18,14 @@ install:
 
 script:
   # Check the role/playbook's syntax.
-  - "ansible-playbook -i tests/inventory tests/$SITE --syntax-check"
+  - "ansible-playbook -i inventory $SITE --syntax-check"
 
   # Run the role/playbook with ansible-playbook.
-  - "ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo"
+  - "ansible-playbook -i inventory $SITE --connection=local --sudo"
 
   # Run the role/playbook again, checking to make sure it's idempotent.
   - >
-    ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo
+    ansible-playbook -i inventory $SITE --connection=local --sudo
     | grep -q 'changed=0.*failed=0'
     && (echo 'Idempotence test: pass' && exit 0)
     || (echo 'Idempotence test: fail' && exit 1)
diff --git a/dummy-ansible-hosts b/dummy-ansible-hosts
deleted file mode 100644
index 0f9fca8fc..000000000
--- a/dummy-ansible-hosts
+++ /dev/null
@@ -1,9 +0,0 @@
-# Dummy ansible host file
-# Used for syntax check
-# Before committing code please run: ansible-playbook --syntax-check site.yml -i dummy-ansible-hosts
-[mons]
-127.0.0.1
-[osds]
-127.0.0.1
-[mdss]
-127.0.0.1
diff --git a/test.yml b/test.yml
new file mode 100644
index 000000000..2fbb50c4a
--- /dev/null
+++ b/test.yml
@@ -0,0 +1 @@
+localhost
diff --git a/tests/inventory b/tests/inventory
deleted file mode 100644
index 2fbb50c4a..000000000
--- a/tests/inventory
+++ /dev/null
@@ -1 +0,0 @@
-localhost
diff --git a/tests/test.yml b/tests/test.yml
deleted file mode 100644
index 7b94da40e..000000000
--- a/tests/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-- hosts: localhost
-  remote_user: root
-  roles:
-    - ceph-common
-    - ceph-mon
-    - ceph-osd
-    - ceph-mds
-    - ceph-radosgw
-    - haproxy