improve how to obtain ansible bin path

rundeck-plugins · Oct 29, 2024 · 17ce4c4 · 17ce4c4
1 parent c87715a
commit 17ce4c4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/main/groovy/com/rundeck/plugins/ansible/ansible/AnsibleInventoryList.java b/src/main/groovy/com/rundeck/plugins/ansible/ansible/AnsibleInventoryList.java
@@ -11,6 +11,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -21,7 +23,7 @@
 public class AnsibleInventoryList {
 
     private String inventory;
-    private String ansibleBinariesDirectoryPath;
+    private Path ansibleBinariesDirectory;
     private String configFile;
     private boolean debug;
 
@@ -34,7 +36,7 @@ public class AnsibleInventoryList {
     private File vaultPromptFile;
     private File tempLimitFile;
 
-    public static final String ANSIBLE_INVENTORY = "ansible-inventory";
+    public static final String ANSIBLE_INVENTORY_COMMAND = "ansible-inventory";
 
     /**
      * Executes Ansible command to bring all nodes from inventory
@@ -43,10 +45,11 @@ public class AnsibleInventoryList {
     public String getNodeList() throws IOException, AnsibleException {
 
         List<String> procArgs = new ArrayList<>();
-        if(ansibleBinariesDirectoryPath!=null && !ansibleBinariesDirectoryPath.isEmpty()) {
-            procArgs.add(ansibleBinariesDirectoryPath+"/"+ANSIBLE_INVENTORY);
+        String ansibleCommand = ANSIBLE_INVENTORY_COMMAND;
+        if(ansibleBinariesDirectory!=null) {
+            ansibleCommand = Paths.get(ansibleBinariesDirectory.toFile().getAbsolutePath(), ansibleCommand).toFile().getAbsolutePath();
         }
-        procArgs.add(ANSIBLE_INVENTORY);
+        procArgs.add(ansibleCommand);
         //inventory can be defined in ansible.cfg
         if(inventory!=null && !inventory.isEmpty()){
             procArgs.add("--inventory-file" + "=" + inventory);

diff --git a/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsibleResourceModelSource.java b/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsibleResourceModelSource.java
@@ -763,7 +763,7 @@ public String getNodesFromInventory(AnsibleRunner.AnsibleRunnerBuilder runnerBui
     if (this.ansibleInventoryListBuilder == null) {
       this.ansibleInventoryListBuilder = AnsibleInventoryList.builder()
               .inventory(inventory)
-              .ansibleBinariesDirectoryPath(ansibleBinariesDirectoryPath)
+              .ansibleBinariesDirectory(java.nio.file.Path.of(ansibleBinariesDirectoryPath))
               .configFile(configFile)
               .debug(debug);
     }