Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RPL-37 Allow custom bin path on gather facts false #398

Merged
merged 6 commits into from
Nov 7, 2024
Merged

RPL-37 Allow custom bin path on gather facts false #398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ab48575
allow custom bin path on gather facts false
Jesus-Osuna-M Oct 24, 2024
c87715a
avoid NPE on default bin path
Jesus-Osuna-M Oct 24, 2024
17ce4c4
improve how to obtain ansible bin path
Jesus-Osuna-M Oct 29, 2024
72fd40a
avoid error when using default bin path
Jesus-Osuna-M Oct 29, 2024
06187bb
fix logic on getNodesFromInventory
Jesus-Osuna-M Nov 7, 2024
1beb496
remove duplicate code
Jesus-Osuna-M Nov 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/main/groovy/com/rundeck/plugins/ansible/ansible/AnsibleInventoryList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -21,6 +23,7 @@
public class AnsibleInventoryList {

private String inventory;
private Path ansibleBinariesDirectory;
private String configFile;
private boolean debug;

Expand All @@ -33,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
Expand All @@ -42,7 +45,11 @@ public class AnsibleInventoryList {
public String getNodeList() throws IOException, AnsibleException {

List<String> procArgs = new ArrayList<>();
procArgs.add(ANSIBLE_INVENTORY);
String ansibleCommand = ANSIBLE_INVENTORY_COMMAND;
if(ansibleBinariesDirectory!=null) {
ansibleCommand = Paths.get(ansibleBinariesDirectory.toFile().getAbsolutePath(), ansibleCommand).toFile().getAbsolutePath();
}
procArgs.add(ansibleCommand);
//inventory can be defined in ansible.cfg
if(inventory!=null && !inventory.isEmpty()){
procArgs.add("--inventory-file" + "=" + inventory);
Expand Down
6 changes: 6 additions & 0 deletions src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsibleResourceModelSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,8 +761,14 @@ public String getNodesFromInventory(AnsibleRunner.AnsibleRunnerBuilder runnerBui
AnsibleRunner runner = runnerBuilder.build();

if (this.ansibleInventoryListBuilder == null) {
Path ansibleBinPath = null;
if (ansibleBinariesDirectoryPath != null && !ansibleBinariesDirectoryPath.isEmpty()) {
ansibleBinPath = (java.nio.file.Path.of(ansibleBinariesDirectoryPath));
}

this.ansibleInventoryListBuilder = AnsibleInventoryList.builder()
.inventory(inventory)
.ansibleBinariesDirectory(ansibleBinPath)
.configFile(configFile)
.debug(debug);
}
Expand Down
Loading