Merge pull request #461 from roots/ansible-2.0

Ansible 2.0 compatibility

.travis.yml

@@ -6,6 +6,6 @@ install:
   - pip install ansible
 script:
   - ansible-galaxy install --force -r requirements.yml -p vendor/roles
-  - ansible-playbook --syntax-check -i hosts/development deploy.yml
-  - ansible-playbook --syntax-check -i hosts/development dev.yml
-  - ansible-playbook --syntax-check -i hosts/development server.yml
+  - ansible-playbook --syntax-check -e env=development deploy.yml
+  - ansible-playbook --syntax-check -e env=development dev.yml
+  - ansible-playbook --syntax-check -e env=development server.yml

CHANGELOG.md

@@ -1,4 +1,5 @@
 ### HEAD
+* Ansible 2.0 compatibility ([#461](https://github.com/roots/trellis/pull/461))
 * Add pre-flight checks for common deploy problems ([#459](https://github.com/roots/trellis/pull/459))
 * Prevent duplicate hosts entries made by `vagrant-hostsupdater` ([#458](https://github.com/roots/trellis/pull/458))
 * Fix README's `ansible-playbook` command for server.yml ([#456](https://github.com/roots/trellis/pull/456))

README.md

@@ -38,7 +38,7 @@ Trellis documentation is available at [https://roots.io/trellis/docs/](https://r
 
 ## Requirements
 
-* Ansible >= 1.9.2 (**not** 2.0 which is in alpha) - [Install](http://docs.ansible.com/intro_installation.html) • [Docs](http://docs.ansible.com/) • [Windows docs](https://roots.io/trellis/docs/windows/)
+* Ansible >= 1.9.2 - [Install](http://docs.ansible.com/intro_installation.html) • [Docs](http://docs.ansible.com/) • [Windows docs](https://roots.io/trellis/docs/windows/)
 * Virtualbox >= 4.3.10 - [Install](https://www.virtualbox.org/wiki/Downloads)
 * Vagrant >= 1.5.4 - [Install](http://www.vagrantup.com/downloads.html) • [Docs](https://docs.vagrantup.com/v2/)
 * vagrant-bindfs >= 0.3.1 - [Install](https://github.com/gael-ian/vagrant-bindfs#installation) • [Docs](https://github.com/gael-ian/vagrant-bindfs) (Windows users may skip this)

dev.yml

@@ -1,7 +1,7 @@
 ---
 - name: "WordPress Server: Install LEMP Stack with PHP 5.6 and MariaDB MySQL"
   hosts: web:&development
-  sudo: yes
+  become: yes
   remote_user: vagrant
 
   roles:

roles/php/defaults/main.yml

@@ -22,5 +22,4 @@ php_opcache_fast_shutdown: 1
 php_opcache_interned_strings_buffer: 8
 php_opcache_max_accelerated_files: 4000
 php_opcache_memory_consumption: 128
-php_opcache_memory_consumption: 128
 php_opcache_revalidate_freq: 60

roles/users/tasks/main.yml

@@ -48,7 +48,7 @@
   local_action: command ansible {{ inventory_hostname }} -m ping -i {{ inventory_file }} -u {{ admin_user }}
   failed_when: false
   changed_when: false
-  sudo: no
+  become: no
   register: admin_user_status
   when: not sshd_permit_root_login
 

roles/wordpress-install/tasks/main.yml

@@ -1,5 +1,6 @@
 ---
-- include: directories.yml tags=wordpress-install-directories
+- include: directories.yml
+  tags: wordpress-install-directories
 
 - name: Create .env file
   template: src="env.j2"

roles/wordpress-setup/tasks/main.yml

@@ -1,7 +1,10 @@
 ---
-- include: database.yml tags=wordpress-setup-database
-- include: self-signed-certificate.yml tags=wordpress-setup-self-signed-certificate
-- include: nginx.yml tags=wordpress-setup-nginx
+- include: database.yml
+  tags: wordpress-setup-database
+- include: self-signed-certificate.yml
+  tags: wordpress-setup-self-signed-certificate
+- include: nginx.yml
+  tags: wordpress-setup-nginx
 
 - name: Create web root
   file:

server.yml

@@ -11,7 +11,7 @@
 
 - name: WordPress Server - Install LEMP Stack with PHP 5.6 and MariaDB MySQL
   hosts: web:&{{ env }}
-  sudo: yes
+  become: yes
   roles:
     - { role: common, tags: [common] }
     - { role: swapfile, swapfile_size: 1GB, tags: [swapfile] }