Merge pull request #464 from Kitware/ansible-cleanup

Ansible cleanup
Kitware · Dec 9, 2016 · 4d1aa12 · 4d1aa12
2 parents 4856b32 + 8a4a8e1
commit 4d1aa12
Show file tree

Hide file tree

Showing 19 changed files with 179 additions and 2,397 deletions.
diff --git a/app/resonantlab/.gitignore b/app/resonantlab/.gitignore
@@ -4,5 +4,5 @@ web_client/lib/
 *.ai
 *.pdf
 .vagrant
-ansible/playbook*.retry
+ansible/**/site.retry
 ga.js
diff --git a/app/resonantlab/README.md b/app/resonantlab/README.md
@@ -115,10 +115,10 @@ webpack --watch
 ## Installation via Ansible
 
 Resonant Lab comes with an Ansible deployment strategy as well. To use
-it, you will need Ansible 2.0:
+it, you will need Ansible 2.2:
 
 ```shell
-pip install ansible==2.0
+pip install ansible==2.2
 ```
 
 Next, clone this repository:

diff --git a/app/resonantlab/Vagrantfile b/app/resonantlab/Vagrantfile
@@ -23,7 +23,8 @@ Vagrant.configure("2") do |config|
       "all" => ['reslab']
     }
 
-    ansible.playbook = "ansible/playbook-#{box}.yml"
+    ansible.playbook = "ansible/#{box}/site.yml"
+    ansible.galaxy_role_file = "ansible/#{box}/requirements.yml"
 
     Extra_vars = ENV['ANSIBLE_EXTRA_VARS']
     if !Extra_vars.nil? && !Extra_vars.empty?

diff --git a/app/resonantlab/ansible/.gitignore b/app/resonantlab/ansible/.gitignore
@@ -0,0 +1 @@
+roles/