External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-13 19:10:07 -03:30
Code Issues Packages Projects Releases Wiki Activity
25,565 Commits 54 Branches 19 Tags
Commit Graph

25565 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
softwarefactory-project-zuul[bot]
4cf38db19c
Merge pull request #6837 from nixocio/ui_issue_6171 
Add Edit/Delete buttons to JT Schedule Details

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-04-30 20:08:33 +00:00
softwarefactory-project-zuul[bot]
b0ab3fbe10
Merge pull request #6834 from jlmitch5/searchFixes2 
fix the scm_type search on projects lists and make search keys show labels instead of api values

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-04-30 17:29:07 +00:00
softwarefactory-project-zuul[bot]
f9b3fb4321
Merge pull request #6895 from ansible/shanemcd-patch-1 
Remove problematic variable

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-04-30 15:56:49 +00:00
Shane McDonald
9be1fd56d2
Remove problematic variable 
This is already here: https://github.com/ansible/awx/blob/devel/installer/roles/kubernetes/defaults/main.yml#L58

Was also causing downstream stuff to break.
 2020-04-30 11:09:06 -04:00
softwarefactory-project-zuul[bot]
6d07064ca2
Merge pull request #6740 from AlexSCorey/6573-InventorySourceList 
Inventory source list

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-04-30 14:47:38 +00:00
John Mitchell
697b0c634d add additional merge params test, remove unnecessary span container from search chips 2020-04-29 16:53:08 -04:00
John Mitchell
fd91c8e329 update project type search to scm_type 2020-04-29 16:53:08 -04:00
John Mitchell
6f80e5b67b use labels in chips for select based filters 2020-04-29 16:53:08 -04:00
nixocio
271b19bf09 Add Edit/Delete buttons to JT Schedule Details 
Also, add unit-tests to the related changes.

Closes: https://github.com/ansible/awx/issues/6171
 2020-04-29 15:39:28 -04:00
softwarefactory-project-zuul[bot]
72de660ea1
Merge pull request #6880 from ryanpetrello/fix-awxkit-new-pip 
Keep awxkit's requirements on the setup.py

Reviewed-by: Jacob Callahan
             https://github.com/JacobCallahan
11.2.0 		2020-04-29 19:24:57 +00:00
softwarefactory-project-zuul[bot]
042c854ad3
Merge pull request #6877 from ryanpetrello/install-doc-cleanup 
cleanup and clarify some installation instructions

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-04-29 18:53:31 +00:00
Ryan Petrello
9aed49e146
update the 11.2.0 changelog 2020-04-29 14:49:09 -04:00
Elyézer Rezende
5c91f66316
Keep awxkit's requirements on the setup.py 
awxkit's setup.py was making use of pip internal structures to parse the
requirements.txt file. This is not a good thing as they may change,
actually that just happened.

To avoid this in the future, move the list of requirements to setup.py
and make requirements.txt list `.` as the only item. This way we keep a
single place to update requirements in the future and avoid accessing
pip's internals.
 2020-04-29 14:47:21 -04:00
softwarefactory-project-zuul[bot]
5e223db945
Merge pull request #6808 from AlexSCorey/6694-WebhookDataOnJTDEETs 
Adds webhook fields to job template details

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-04-29 18:43:53 +00:00
Ryan Petrello
67e2f19aaf
cleanup and clarify some installation instructions 2020-04-29 14:09:04 -04:00
softwarefactory-project-zuul[bot]
e940f1f7df
Merge pull request #6849 from ggiinnoo/ssl-seperate-key 
Added variable to inventory to add a separate SSL key file

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-04-29 14:38:32 +00:00
softwarefactory-project-zuul[bot]
ebee75e91e
Merge pull request #6868 from john-westcott-iv/sdb_notigy_host_ox_x 
Set SDB_NOTIFY_HOST on non-docker OS X

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-04-29 14:01:04 +00:00
softwarefactory-project-zuul[bot]
e641433c68
Merge pull request #6860 from ryanpetrello/version-11-2-0 
bump version 11.2.0

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-04-29 00:31:30 +00:00
softwarefactory-project-zuul[bot]
c5dc03d4a9
Merge pull request #6867 from AlexSCorey/TestDebug 
Fixes failing test

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-04-28 23:18:33 +00:00
John Westcott IV
3a6a7c100a Going for a more generic 'just pass' option 2020-04-28 16:47:08 -04:00
John Westcott IV
cd07305c08 Set SDB_NOTIFY_HOST on non-docker OS X 2020-04-28 16:37:35 -04:00
Alex Corey
c39423d5ca Fixes failing test 2020-04-28 16:26:46 -04:00
Ryan Petrello
3f00329abd
bump version 11.2.0 2020-04-28 13:55:59 -04:00
softwarefactory-project-zuul[bot]
def3114b5b
Merge pull request #6856 from ryanpetrello/devel 
merge in a few downstream fixes

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-04-28 17:21:28 +00:00
softwarefactory-project-zuul[bot]
fcc99baaa8
Merge pull request #6848 from vandreykiv/devel 
Updated ingress template for kubernetes to support HTTP and HTTPS when annotations not set

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-04-28 16:52:46 +00:00
Ryan Petrello
aad371d224
Merge branch 'downstream' into devel 2020-04-28 12:18:13 -04:00
Vyacheslav Andreykiv
d5cb6ad58a
Update main.yml 
Reverted formating changes
 2020-04-28 08:56:29 -07:00
ggiinnoo
0bad717db7 Wrong syntax 2020-04-28 17:51:41 +02:00
softwarefactory-project-zuul[bot]
b31abbba82
Merge pull request #6220 from kawsark/devel 
Modified hashivault.py to support approle

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-04-28 15:50:21 +00:00
Ryan Petrello
0d30a67756
Merge pull request #4273 from wenottingham/certscertscerts 
Allow unsigned certs in logging if cert verification is disabled.
 2020-04-28 11:17:19 -04:00
Bill Nottingham
5d24acf613 Allow unsigned certs in logging if cert verification is disabled. 2020-04-28 11:16:54 -04:00
Ryan Petrello
94692c2364
Merge pull request #4272 from chrismeyersfsu/sos_report_redis_logs 
sos report redis logs
 2020-04-28 11:00:41 -04:00
Ryan Petrello
29abe35799
Merge pull request #4268 from fosterseth/fix-ip_conflict_cluster 
Unset IP address of old instance if conflicting with new instance IP
 2020-04-28 10:59:27 -04:00
Seth Foster
6652464e25
Unset old instance IP when conflicting new instance IP 
With AWX_AUTO_DEPROVISION_INSTANCES on, instances
are registered with an ip address. However, new
instances might try to register before old instances
are deprivisioned. In this case old IPs can conflict with
the new ones. This will check for an ip conflict and unset
the IP of conflicting instance (set to None)

ansible/awx issue 6750
 2020-04-28 10:52:15 -04:00
Pierre-Louis Bonicoli
f9d5860d63
Fix pylint errors 2020-04-28 10:33:41 -04:00
Pierre-Louis Bonicoli
d8ac2f5263
Avoid to repeat default value 2020-04-28 10:33:40 -04:00
Pierre-Louis Bonicoli
fdae3cd092
Explicitly references AppRole 2020-04-28 10:33:40 -04:00
Pierre-Louis Bonicoli
139384acc4
Simplify test branches 2020-04-28 10:33:40 -04:00
Pierre-Louis Bonicoli
9d85e8655d
Both methods return a token: rename variable 2020-04-28 10:33:40 -04:00
Pierre-Louis Bonicoli
9fdd9061d3
Remove extraneous call to bool built-in function 2020-04-28 10:33:39 -04:00
kawsark
d3d4ce3804
Modified hashivault.py to support approle 2020-04-28 10:33:37 -04:00
chris meyers
960aa9df16 add redis logs to sosreport 
* rhel8 /var/log/redis/redis.log
* rhel7 scl location
 2020-04-28 09:12:42 -04:00
ggiinnoo
41a8d32dcc Added variable to inventory to add a separate key file 2020-04-28 11:13:47 +02:00
Bianca Henderson
12b47405f0
Merge pull request #4265 from john-westcott-iv/release_3.7.0 
Restructuring modules so that lookup don't happen if deleting
 2020-04-27 17:39:11 -04:00
Vyacheslav Andreykiv (Intel)
7659ffca1e fixed ingress template 2020-04-27 14:33:42 -07:00
Alan Rominger
41014e62b7
Avoid applying galaxy settings if no user settings exist (#4262) 2020-04-27 16:15:11 -04:00
Alex Corey
df1489bcee Addresses some object mutation issues and improves testing 2020-04-27 15:49:22 -04:00
Alex Corey
4c72ab896a Adds Inventory Source List 2020-04-27 15:49:22 -04:00
softwarefactory-project-zuul[bot]
c2e9df74e4
Merge pull request #6790 from fherbert/feature/awx_cli_job_monitor 
Add ability to monitor jobs and workflow_jobs via awx cli, fixes #6165

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-04-27 19:48:33 +00:00
Ryan Petrello
e1cedcfb04
Merge pull request #4266 from rooftopcellist/rsyslog_followup 
Increase stopwait time for rsyslogd service
 2020-04-27 15:26:49 -04:00