External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-13 20:37:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix up some tower-manage -> awx-manage commands

Browse Source
This commit is contained in:
Matthew Jones
2017-07-24 09:38:36 -04:00
parent f0d68f429c
commit f175fbba23
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/api/templates/api/system_job_template_launch.md
View File

@@ -4,7 +4,7 @@ Make a POST request to this resource to launch the system job template.
Variables specified inside of the parameter `extra_vars` are passed to the Variables specified inside of the parameter `extra_vars` are passed to the
system job task as command line parameters. These tasks can be ran manually system job task as command line parameters. These tasks can be ran manually
on the host system via the `tower-manage` command. on the host system via the `awx-manage` command.
For example on `cleanup_jobs` and `cleanup_activitystream`: For example on `cleanup_jobs` and `cleanup_activitystream`:

4
awx/main/tasks.py
View File

@@ -1810,7 +1810,7 @@ class RunInventoryUpdate(BaseTask):
inventory = inventory_source.inventory inventory = inventory_source.inventory
# Piece together the initial command to run via. the shell. # Piece together the initial command to run via. the shell.
args = ['tower-manage', 'inventory_import'] args = ['awx-manage', 'inventory_import']
args.extend(['--inventory-id', str(inventory.pk)]) args.extend(['--inventory-id', str(inventory.pk)])
# Add appropriate arguments for overwrite if the inventory_update # Add appropriate arguments for overwrite if the inventory_update
@@ -2116,7 +2116,7 @@ class RunSystemJob(BaseTask):
model = SystemJob model = SystemJob
def build_args(self, system_job, **kwargs): def build_args(self, system_job, **kwargs):
args = ['tower-manage', system_job.job_type] args = ['awx-manage', system_job.job_type]
try: try:
json_vars = json.loads(system_job.extra_vars) json_vars = json.loads(system_job.extra_vars)
if 'days' in json_vars and system_job.job_type != 'cleanup_facts': if 'days' in json_vars and system_job.job_type != 'cleanup_facts':

2
tools/sosreport/tower.py
View File

@@ -6,7 +6,7 @@ from distutils.version import LooseVersion
SOSREPORT_TOWER_COMMANDS = [ SOSREPORT_TOWER_COMMANDS = [
"ansible --version", # ansible core version "ansible --version", # ansible core version
"tower-manage --version", # tower version "awx-manage --version", # tower version
"supervisorctl status", # tower process status "supervisorctl status", # tower process status
"/var/lib/awx/venv/tower/bin/pip freeze", # pip package list "/var/lib/awx/venv/tower/bin/pip freeze", # pip package list
"/var/lib/awx/venv/ansible/bin/pip freeze", # pip package list "/var/lib/awx/venv/ansible/bin/pip freeze", # pip package list