commit 2a3791ad402e4f7d9510e911312c1a87e21e929f
author Zack Williams <zdw@cs.arizona.edu> Fri Jan 20 16:17:46 2017 -0700
committer Zack Williams <zdw@cs.arizona.edu> Sun Jan 22 18:48:01 2017 -0700
tree 9671588c1dbb35430aa2c8d8d8a324e070149322
parent 8d69714ed9e6230d4b92978af13ffe4047fa7925

generate config yaml file instead of long extra-vars parameter
fix var and typo
fix variable usage
revert last change

Change-Id: Icba11338e22b8584b9b84c11a7064253b3734cde

build.gradle

diff --git a/build.gradle b/build.gradle
index d85ad1a..4af4504 100644
--- a/build.gradle
+++ b/build.gradle
@@ -311,8 +311,8 @@
     executable = "ansible-playbook"
     args = ["-i", config.seedServer.ip + ',']
 
-    if ( config.seedServer.user != null && config.seedServer.user != "" ) {
-        args = args << "--user=$config.seedServer.user"
+    if ( config.seedServer.ansible_user != null && config.seedServer.ansible_user != "" ) {
+        args = args << "--user=$config.seedServer.ansible_user"
     }
 
     if ( config.debug ) {
@@ -322,8 +322,8 @@
     def extraVars = []
     if (config.seedServer) {
         extraVars = extraVars.p(config.seedServer.extraVars)
-            .p(config.seedServer.password, "ansible_ssh_pass")
-            .p(config.seedServer.sudoPassword, "ansible_sudo_pass")
+            .p(config.seedServer.ansible_ssh_pass, "ansible_ssh_pass")
+            .p(config.seedServer.ansible_become_pass, "ansible_become_pass")
             .p(config.seedServer.fabric_ip, "fabric_ip")
             .p(config.seedServer.fabric_range_low, "fabric_range_low")
             .p(config.seedServer.fabric_range_high, "fabric_range_high")
@@ -374,11 +374,10 @@
     executable = "ansible-playbook"
     args = ["-i", config.seedServer.ip + ',']
 
-    if ( config.seedServer.user != null && config.seedServer.user != "" ) {
-        args = args << "--user=$config.seedServer.user"
+    if ( config.seedServer.ansible_user != null && config.seedServer.ansible_user != "" ) {
+        args = args << "--user=$config.seedServer.ansible_user"
     }
 
-
     if ( config.debug ) {
         args = args << "-vvvv"
     }
@@ -386,8 +385,8 @@
     def extraVars = []
     if (config.seedServer) {
         extraVars = extraVars.p(config.seedServer.extraVars)
-            .p(config.seedServer.password, "ansible_ssh_pass")
-            .p(config.seedServer.sudoPassword, "ansible_sudo_pass")
+            .p(config.seedServer.ansible_ssh_pass, "ansible_ssh_pass")
+            .p(config.seedServer.ansible_become_pass, "ansible_become_pass")
             .p(config.seedServer.fabric_ip, "fabric_ip")
             .p(config.seedServer.fabric_range_low, "fabric_range_low")
             .p(config.seedServer.fabric_range_high, "fabric_range_high")