Skip to content

Commit

Permalink
Flipping Some Defaults
Browse files Browse the repository at this point in the history
* Removing Python3.8 because salt fails
* Related to this issue :
saltstack/salt#55310
  • Loading branch information
chalbersma committed Dec 18, 2019
1 parent 450defb commit ce032c0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ python:
- 3.6
- 3.7
- 3.5
- 3.8
dist: xenail
sudo: required
notifications:
Expand Down
6 changes: 4 additions & 2 deletions manowar_agent
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,11 @@ if __name__ == "__main__":
if configs.get("salt", {}).get("minion_file", False) is False:
# Minion File Is Not Specified Choose Default
minion_defaults = [os.path.dirname(os.path.realpath(CONFIG_FILE)) + "/minion",
"./minion",
"/etc/manowar_agent/minion",
"/usr/local/etc/manowar_agent/minion",
"/etc/salt/minion",
"./minion",
"./etc/manowar_agent/minion",
"/usr/etc/salt/minion"]

for possible_minion in minion_defaults:
Expand All @@ -110,8 +111,9 @@ if __name__ == "__main__":
# Let's Find my Collector Configuration File
if configs.get("stingcell", {}).get("collection_config_file", False) is False:
collector_defaults = [os.path.dirname(os.path.realpath(CONFIG_FILE)) + "/collector.yaml",
"./collector.yaml",
"/etc/manowar_agent/collector.yaml",
"./collector.yaml",
"./etc/manowar_agent/collector.yaml",
"/usr/local/etc/manowar_agent/collector.yaml"]

for possible_collector in collector_defaults:
Expand Down

0 comments on commit ce032c0

Please sign in to comment.