Skip to content

Commit 807c11f

Browse files
committed
change order and prepare for 1.0 release
1 parent c3cecc9 commit 807c11f

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
fetch-depth: 0
3030

3131
- name: Run ansible-lint
32-
uses: ansible-actions/ansible-lint-action@v0.0.4
32+
uses: ansible-actions/ansible-lint-action@v1.0.0
3333
with:
3434
target: "./"
3535
```

ansible_docker.py

+19-19
Original file line numberDiff line numberDiff line change
@@ -90,42 +90,42 @@ def run_command(self, command):
9090
env_pip_txt = EnvironmentManager(ENV_PIPPACKAGE_TXT_NAME)
9191
pip_pkg_txt = env_pip_txt.check_optional_environment_variable()
9292

93-
# run ansible commands
94-
ansible_version_checker = AnsibleCommandExecution()
93+
# execute ansible commands
94+
execute = AnsibleCommandExecution()
9595

9696
# Optionally install required ansible collections directly
9797
if bool(reqired_collection):
98-
ansible_command = ["ansible-galaxy", "collection", "install",
98+
collection_install_command = ["ansible-galaxy", "collection", "install",
9999
f"{reqired_collection}", "--upgrade"]
100-
version_info = ansible_version_checker.run_command(ansible_command)
101-
print(f"COLLECTION INSTALL SUCCESSFUL\n{version_info}")
100+
collection_install_info = execute.run_command(collection_install_command)
101+
print(f"{collection_install_info}\nSINGLE COLLECTION INSTALL SUCCESSFUL")
102102

103103
# Optionally install required ansible collections from yml file
104104
if bool(reqired_collection_yml):
105-
ansible_command = ["ansible-galaxy", "collection", "install", "-r",
105+
collections_install_command = ["ansible-galaxy", "collection", "install", "-r",
106106
f"{reqired_collection_yml}", "--upgrade"]
107-
version_info = ansible_version_checker.run_command(ansible_command)
108-
print(f"COLLECTION.YML INSTALL SUCCESSFUL\n{version_info}")
107+
collections_install_info = execute.run_command(collections_install_command)
108+
print(f"{collections_install_info}\nCOLLECTION.YML INSTALL SUCCESSFUL")
109109

110110
# Optionally install required ansible roles
111111
if bool(reqired_role):
112-
ansible_command = ["ansible-galaxy", "role", "install", f"{reqired_role}", "--upgrade"]
113-
version_info = ansible_version_checker.run_command(ansible_command)
114-
print(f"ROLE INSTALL SUCCESSFUL\n{version_info}")
112+
role_install_command = ["ansible-galaxy", "role", "install", f"{reqired_role}", "--upgrade"]
113+
role_install_info = execute.run_command(role_install_command)
114+
print(f"{role_install_info}\nSINGLE ROLE INSTALL SUCCESSFUL")
115115

116116
# Optionally install pip package directly
117117
if bool(pip_pkg):
118-
ansible_command = ["pip", "install", "--upgrade", f"{pip_pkg}"]
119-
version_info = ansible_version_checker.run_command(ansible_command)
120-
print(f"PIP PACKAGE INSTALL SUCCESSFUL\n{version_info}")
118+
pip_install_command = ["pip", "install", "--upgrade", f"{pip_pkg}"]
119+
pip_install_info = execute.run_command(pip_install_command)
120+
print(f"{pip_install_info}\nPIP PACKAGE INSTALL SUCCESSFUL")
121121

122122
# Optionally install pip package from file
123123
if bool(pip_pkg_txt):
124-
ansible_command = ["pip", "install", "--upgrade", "-r", f"{pip_pkg_txt}"]
125-
version_info = ansible_version_checker.run_command(ansible_command)
126-
print(f"PIP PACKAGE.TXT INSTALL SUCCESSFUL\n{version_info}")
124+
pip_requirements_command = ["pip", "install", "--upgrade", "-r", f"{pip_pkg_txt}"]
125+
pip_requirements_info = execute.run_command(pip_requirements_command)
126+
print(f"{pip_requirements_info}\nPIP PACKAGE.TXT INSTALL SUCCESSFUL")
127127

128128
# run ansible lint
129129
ansible_command = ["ansible-lint", f"{target}"]
130-
linter_run = ansible_version_checker.run_command(ansible_command)
131-
print(f"{linter_run}\n\nAnsible run successful")
130+
linter_run = execute.run_command(ansible_command)
131+
print(f"---start+linter---\n{linter_run}\nAnsible run successful\n---end+linter---")

0 commit comments

Comments
 (0)