Merge pull request #1047 from TangRufus/rollback-vars

Allow overriding rollback variables
roots · Dec 15, 2018 · d67ba0a · d67ba0a
2 parents acdafca + c122be4
commit d67ba0a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ### HEAD
+* Allow overriding rollback variables ([#1047](https://github.com/roots/trellis/pull/1047))
 * Require Vagrant >= 2.1.0 ([#1046](https://github.com/roots/trellis/pull/1046))
 * Bump Ansible `version_tested_max` to 2.7.5 ([#1045](https://github.com/roots/trellis/pull/1045))
 * Add Vagrant `ssh-config` to `~/.ssh/config` on `vagrant up` ([#1042](https://github.com/roots/trellis/pull/1042))

diff --git a/roles/rollback/defaults/main.yml b/roles/rollback/defaults/main.yml
@@ -0,0 +1,2 @@
+project_root: "{{ www_root }}/{{ site }}"
+project_current_path: "{{ wordpress_sites[site].current_path | default('current') }}"
diff --git a/rollback.yml b/rollback.yml
@@ -14,10 +14,5 @@
 - name: Rollback a Deploy
   hosts: web:&{{ env }}
   remote_user: "{{ web_user }}"
-
-  vars:
-    project_root: "{{ www_root }}/{{ site }}"
-    project_current_path: "{{ wordpress_sites[site].current_path | default('current') }}"
-
   roles:
     - rollback
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		project_root: "{{ www_root }}/{{ site }}"
		project_current_path: "{{ wordpress_sites[site].current_path \| default('current') }}"