Rename the variable "gvm_ghq_executable" to "ghq_executable".

suzuki-shunsuke · Oct 24, 2016 · 4c03422 · 4c03422
1 parent c674660
commit 4c03422
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ Requirements
 Role Variables
 --------------
 
-* gvm_ghq_executable: The ghq command path. The default is "ghq".
+* ghq_executable: The ghq command path. The default is "ghq".
 
 Dependencies
 ------------
@@ -27,7 +27,7 @@ Example Playbook
 - hosts: servers
   roles:
   - role: suzuki-shunsuke.gvm
-    gvm_ghq_executable: "{{ansible_env.HOME}}/.go/bin/ghq"
+    ghq_executable: "{{ansible_env.HOME}}/.go/bin/ghq"
 ```
 
 License

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -1,3 +1,3 @@
 ---
 # defaults file for gvm
-gvm_ghq_executable: ghq
+ghq_executable: ghq
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -3,7 +3,7 @@
 - name: Clone moovweb/gvm
   ghq:
     name: moovweb/gvm
-    executable: "{{gvm_ghq_executable}}"
+    executable: "{{ghq_executable}}"
 - name: Notice
   debug:
     msg: "export GVM_ROOT=$GHQ_ROOT/github.com/moovweb/gvm"

diff --git a/tests/test.yml b/tests/test.yml
@@ -1,7 +1,8 @@
 ---
 - include: setup.yml
 - hosts: default
+  vars:
+    ghq_executable: "{{ansible_env.HOME}}/.go/bin/ghq"
   roles:
   - suzuki-shunsuke.ghq-module
-  - role: ansible-gvm
-    gvm_ghq_executable: "{{ansible_env.HOME}}/.go/bin/ghq"
+  - ansible-gvm