Revert "Fix Travis run"

diff --git a/.travis.yml b/.travis.yml
index 15468e179994deb3dfe80d06807e2dd784986cfc..00eac3abb6a5dd0dfa1213b8fc0d8b582f4a9c7d 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,14 +18,14 @@ install:
 
 script:
   # Check the role/playbook's syntax.
-  - "ansible-playbook -i inventory $SITE --syntax-check"
+  - "ansible-playbook -i tests/inventory tests/$SITE --syntax-check"
 
   # Run the role/playbook with ansible-playbook.
-  - "ansible-playbook -i inventory $SITE --connection=local --sudo"
+  - "ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo"
 
   # Run the role/playbook again, checking to make sure it's idempotent.
   - >
-    ansible-playbook -i inventory $SITE --connection=local --sudo
+    ansible-playbook -i tests/inventory tests/$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
new file mode 100644 (file)
index 0000000..0f9fca8
--- /dev/null
+++ b/dummy-ansible-hosts
@@ -0,0 +1,9 @@
+# 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
deleted file mode 100644 (file)
index 2fbb50c..0000000
--- a/test.yml
+++ /dev/null
@@ -1 +0,0 @@
-localhost

diff --git a/tests/inventory b/tests/inventory
new file mode 100644 (file)
index 0000000..2fbb50c
--- /dev/null
+++ b/tests/inventory
@@ -0,0 +1 @@
+localhost

diff --git a/tests/test.yml b/tests/test.yml
new file mode 100644 (file)
index 0000000..7b94da4
--- /dev/null
+++ b/tests/test.yml
@@ -0,0 +1,10 @@
+---
+- hosts: localhost
+  remote_user: root
+  roles:
+    - ceph-common
+    - ceph-mon
+    - ceph-osd
+    - ceph-mds
+    - ceph-radosgw
+    - haproxy