Commit c27978fa by Brian Coca

minor fixes to pull

parent 9f29e39d
...@@ -23,12 +23,11 @@ import random ...@@ -23,12 +23,11 @@ import random
import shutil import shutil
import socket import socket
import sys import sys
import time
from ansible import constants as C from ansible.errors import AnsibleOptionsError
from ansible.errors import AnsibleError, AnsibleOptionsError
from ansible.cli import CLI from ansible.cli import CLI
from ansible.plugins import module_loader from ansible.plugins import module_loader
from ansible.utils.display import Display
from ansible.utils.cmd_functions import run_cmd from ansible.utils.cmd_functions import run_cmd
######################################################## ########################################################
...@@ -219,7 +218,7 @@ class PullCLI(CLI): ...@@ -219,7 +218,7 @@ class PullCLI(CLI):
fqdn = socket.getfqdn() fqdn = socket.getfqdn()
hostpb = os.path.join(path, fqdn + '.yml') hostpb = os.path.join(path, fqdn + '.yml')
shorthostpb = os.path.join(path, fqdn.split('.')[0] + '.yml') shorthostpb = os.path.join(path, fqdn.split('.')[0] + '.yml')
localpb = os.path.join(path, DEFAULT_PLAYBOOK) localpb = os.path.join(path, self.DEFAULT_PLAYBOOK)
errors = [] errors = []
for pb in [hostpb, shorthostpb, localpb]: for pb in [hostpb, shorthostpb, localpb]:
rc = self.try_playbook(pb) rc = self.try_playbook(pb)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment