diff --git a/docker/scripts/run-ansible-playbook.py b/docker/scripts/run-ansible-playbook.py index 0f5e1b6..479984e 100644 --- a/docker/scripts/run-ansible-playbook.py +++ b/docker/scripts/run-ansible-playbook.py @@ -55,11 +55,11 @@ def build_cmdLine_args(rc): rc.cmdline_args += " -u " + os.environ.get('ANSIBLE_PLAYBOOK_REMOTE_USER') -def execute_playbook(): +def execute_playbook(projectdir): rc = RunnerConfig( private_data_dir="/data", - project_dir=os.environ.get('ANSIBLE_PLAYBOOK_WORKSPACE_PATH', "/workspace") + project_dir=projectdir ) rc.playbook=os.environ.get('ANSIBLE_PLAYBOOK', "site.yml") @@ -77,17 +77,18 @@ def execute_playbook(): r = Runner(config=rc) r.run() -def list_workspace(rc): +def list_workspace(projectdir): print("---------------------------------------") - print("workspace files:" + " " + rc.project_dir) - items=os.listdir(rc.project_dir) + print("workspace files:" + " " + projectdir) + items=os.listdir(projectdir) for image in items: print(image) print("---------------------------------------") def main(): - list_workspace(); - execute_playbook() + projectdir = os.environ.get('ANSIBLE_PLAYBOOK_WORKSPACE_PATH', "/workspace") + list_workspace(projectdir) + execute_playbook(projectdir) main()