- Add .vagrant directories to gitignore - Add volunteer portal host and volunteer portal instance role - Add postgresql instance role - Fix tomcat role to allow customising server.xml (Ubuntu only) - Fix some variable usage that ansible complained about, $var to {{ var }} - Use 12.04.4 ubuntu 64 bit vagrant box
- Remove commented lines - Remove accidentally added line from solr
- Remove unnecessary vars from production inventory
- Fix ala-demo and volunteer-portal scripts to work on CentOS - Additional fixes to use more ansible modules instead of shell scripts, etc to get more accurate changed reporting - Add jenkins role and host
Remove production information
Merge branch 'master' into volunteer-portal-2

Conflicts:
	ansible/inventories/vagrant
remove username
Merge branch 'master' into volunteer-portal-2
Merge branch 'master' into volunteer-portal-2

Conflicts:
	ansible/roles/cassandra/tasks/main.yml
Add webapi instance role
Add ansible module(s) for simple tomcat configuration
Change tomcat role to use new module
Merge branch 'master' into volunteer-portal-3

Conflicts:
	ansible/inventories/vagrant
Remove virtualbox directories
Change name form VP to webapi
Add jenkins home in /data
Merge pull request #12 from sbearcsiro/volunteer-portal-2

Volunteer portal and jenkins
Updated ansible config for logger-service
Fixed url pattern for admin screens
Moved SQL scripts from logger service repo, fixed ansible script to run them
Fixed virtual host config for logger-service install
Updates to incorporate logger-service in the ala demo, including moving the log4j.xml file from biocache-service to ansible so it can be parameterised