minor fixes to pull

pull/11947/head
Brian Coca 9 years ago
parent 9f29e39dea
commit c27978fa93

@ -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):
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)

Loading…
Cancel
Save