Merge branch 'master' into 'master'

Add test-suite to deploy.nexedi.cn cache See merge request !4

Merge branch 'master' into 'master'
Add test-suite to deploy.nexedi.cn cache See merge request !4
4c2d4f6e · Rafael Monnerat · 95220faf · 58af7360 · 4c2d4f6e · 4c2d4f6e
Commit 4c2d4f6e authored Jul 01, 2015 by Rafael Monnerat
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

playbook/install-script.yml playbook/install-script.yml +1 -0

playbook/test-suite.yml playbook/test-suite.yml +0 -1

No files found.
--- a/playbook/install-script.yml
+++ b/playbook/install-script.yml
@@ -50,3 +50,4 @@
    - { role: "install-script", playbook_yml: "imt-vm-bootstrap.yml", script_path: "install/imt/vm-bootstrap"}
    - { role: "install-script", playbook_yml: "imt-vm-cloudera-manager.yml", script_path: "install/imt/vm-cloudera-manager"}
    - { role: "install-script", playbook_yml: "imt-re6stnet.yml", script_path: "install/imt/re6st"}
+    - { role: "install-script", playbook_yml: "test-suite.yml", script_path: "install/test-suite"}
--- a/playbook/test-suite.yml
+++ b/playbook/test-suite.yml
@@ -3,5 +3,4 @@
  connection: local
  roles:
-    - re6st # make sure we have ipv6
    - test-suite