External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-11 01:57:35 -03:30
Code Issues Packages Projects Releases Wiki Activity
33,239 Commits 54 Branches 19 Tags
Commit Graph

33239 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Westcott IV
8c187c74fc
Adding "password": "$encrypted$" to user serializer (#13704) 
Co-authored-by: Jessica Steurer <70719005+jay-steurer@users.noreply.github.com>
 2023-04-25 10:18:01 -03:00
Jesse Wattenbarger
2ce9440bab
Merge pull request #13896 from jjwatt/jjwatt-pyver 
Fallback on PYTHON path in Makefile
 2023-04-24 10:10:30 -04:00
Jesse Wattenbarger
765487390f Fallback on PYTHON path in Makefile 
- Change default PYTHON in Makefile to be ranked choice
- Fix `PYTHON_VERSION` target that expects just a word
- Use native GNU Make `$(subst ,,)` instead of `sed`
- Add 'version-for-buildyml' target to simplify ci

If I understand correctly, this change should make
'$(PYTHON)' work how we want it to everywhere. Before
this change, on develpers' machines that don't have
a 'python3.9' in their path, make would fail. With this
change, we will prefer python3.9 if it's available, but
we'll take python3 otherwise.
 2023-04-21 09:50:05 -04:00
Alan Rominger
086722149c
Avoid recursive include of DEFAULT_SETTINGS, add sanity test (#13236) 
* Avoid recursive include of DEFAULT_SETTINGS, add sanity test to avoid similar surprises

* Implement review comments for more clear code order and readability

* Clarify comment about order of app name, which is last in order so that it can modify user settings
 2023-04-20 15:15:34 -04:00
Sarah Akus
c10ada6f44
Merge pull request #13876 from marshmalien/9668-adhoc-credentials-search 
Fix credentials search in adhoc prompt modal
 2023-04-20 13:41:36 -04:00
Sarah Akus
b350cd053d
Merge pull request #13886 from marshmalien/fix-wf-approval-job-details 
Fix incorrect workflow approval job details
 2023-04-20 13:31:32 -04:00
Alan Rominger
d0acb1c53f
Delete cp of local_settings.py file in test running, because path no longer exists (#13894) 
* Change reference to moved local_settings.py file

* Do not appy local_settings to test runner
 2023-04-20 13:19:00 -04:00
Hao Liu
f61b73010a
Merge pull request #13889 from TheRealHaoLiu/egg-liminate 
Remove unnecessary egg-link linking
 2023-04-19 17:12:28 -04:00
Hao Liu
adb89cd48f Remove unnecessary egg-link linking 
we link awx.egg-link from `tools/docker-compose/awx.egg-link` to `/tmp/awx.egg-link` than we move `/tmp/awx.egg-link` to `/var/lib/awx/venv/awx/lib/python3.9/site-packages/awx.egg-link`

bonus... now we dont have to set PYTHON=python3.9
 2023-04-19 16:36:51 -04:00
Hao Liu
3e509b3d55
Merge pull request #13883 from ZitaNemeckova/remove_inventories_from_host_metrics 
Remove Inventories column for now
 2023-04-19 15:41:32 -04:00
Hao Liu
f0badea9d3
Merge pull request #13888 from TheRealHaoLiu/correct-make-call-make 
Make target should not call make directly
 2023-04-19 15:38:58 -04:00
Hao Liu
6a1ec0dc89
Merge pull request #13887 from TheRealHaoLiu/no-make-run-stuff-in-docker-compose 
Stop using make to start awx processes part 1
 2023-04-19 15:35:32 -04:00
Hao Liu
329fb88bbb Make target should not call make directly 
https://www.gnu.org/software/make/manual/html_node/MAKE-Variable.html

make target should always call make with $(MAKE)
 2023-04-19 15:01:16 -04:00
Hao Liu
177f8cb7b2 Stop using make to start processes 
part 1...

we dont need to run awx processes through make
because awx-manage uses awx-python which is already activating the correct venv
 2023-04-19 14:51:38 -04:00
Marliana Lara
b43107a5e9
Fix credentials search in adhoc prompt modal 2023-04-19 13:59:08 -04:00
Marliana Lara
e7c80fe1e8
Fix incorrect workflow approval job details 2023-04-19 13:57:05 -04:00
Hao Liu
33f1c35292
Merge pull request #13658 from TheRealHaoLiu/different-dockerfile 
Use different dockerfile for docker-compose-build
 2023-04-19 12:12:54 -04:00
Hao Liu
ba899324f2
Merge pull request #13856 from TheRealHaoLiu/kube-dev-autoreload 
Auto reload services in kube dev env
 2023-04-19 12:08:52 -04:00
Hao Liu
9c236eb8dd
Merge pull request #13882 from TheRealHaoLiu/link-launch-n-supervisord 
Link launch script and supervisor conf in kube dev
 2023-04-19 12:03:22 -04:00
Zita Nemeckova
36559a4539 Remove Inventories column for now. Revert this commit once the backend is ready. 2023-04-19 15:55:02 +02:00
Hao Liu
7a4b3ed139
Merge pull request #13881 from TheRealHaoLiu/fix-copy 
Fix copy API
 2023-04-19 09:39:39 -04:00
Gabriel Muniz
cd5cc64d6a
Fix 500 on missing inventory for provisioning callbacks (#13862) 
* Fix 500 on missing inventory for provisioning callbacks

* Added test to cover bug fix

* Reworded msg to clear what is missing to start the callback
 2023-04-19 09:27:41 -04:00
Hao Liu
71a11ea3ad Link launch script and supervisor conf in kube dev 
Linking launch script and supervisor conf file in kube development environment so we no longer have to rebuild kube devel images for superviosr conf file and launch script changes
 2023-04-18 23:22:53 -04:00
Hao Liu
cfbbc4cb92 Auto reload services in kube dev env 2023-04-18 23:15:47 -04:00
Hao Liu
592920ee51 Use different dockerfile for docker-compose-build 
- use different dockerfile for awx_devel and awx image
- make all Dockerfile* targets PHONY (bc its cheap to run)
- fix HEADLESS not working for awx-kube-build
 2023-04-18 21:45:31 -04:00
Hao Liu
b75b84e282
Merge pull request #13725 from l3acon/collection-existential-state-for-credential-module 
[collection] Add "exists" state for credential module
 2023-04-18 20:51:14 -04:00
Sarah Akus
f4b80c70e3
Merge pull request #13849 from marshmalien/10854-instances-403-error 
Check user permissions before fetching system settings
 2023-04-18 16:41:40 -04:00
Hao Liu
9870187af5 Fix copy API 
In web/task split deployment web and task container no longer share the same redis cache

In the original code we use redis cache to pass the list of sub objects that need to be copied to the new object

In this PR we extracted out the logic that computes the sub_object_list and move it into deep_copy_model_obj task
 2023-04-18 16:03:04 -04:00
Michael Abashian
bbb436ddbb
Merge pull request #13872 from mabashian/remove-codemirror 
Removes unused codemirror dependency
 2023-04-18 15:27:12 -04:00
Michael Abashian
abf915fafe
Removes more unnecessary licenses 2023-04-18 15:06:19 -04:00
Michael Abashian
481814991e
Remove codemirror licenses 2023-04-18 15:06:18 -04:00
Michael Abashian
e94ee8f8d7
Removes unused codemirror dependency 2023-04-18 15:06:18 -04:00
John Westcott IV
e660f62a59
Merge pull request #13875 from john-westcott-iv/fix_assumed_databases 
Fixing issue were we assumed DATABASES would be defined
 2023-04-18 14:21:17 -04:00
Keith Grant
a2a04002b6
Merge pull request #13869 from keithjgrant/persistent-filter-race-condition 
Rework PersistentFilter to avoid double API call
 2023-04-18 11:13:19 -07:00
John Westcott IV
93117c8264 Fixing issue were we assumed DATABSES would be defined 2023-04-18 13:57:17 -04:00
Keith J. Grant
b8118ac86a remove outdated tests 2023-04-18 10:04:28 -07:00
Keith J. Grant
c08f1ddcaa rework PersistentFilter to avoid double API call 2023-04-18 10:04:28 -07:00
Matthew Fernandez
d57f549a4c
Merge branch 'devel' into collection-existential-state-for-credential-module 2023-04-18 09:51:54 -06:00
matt
93e6f974f6 remove redundant loop 2023-04-18 09:51:20 -06:00
John Westcott IV
32f7dfece1
Changing check for all in awx.awx.export (#13854) 2023-04-18 10:29:25 -03:00
Michael Abashian
68b32b9b4f
Merge branch 'devel' into 10854-instances-403-error 2023-04-17 10:14:44 -04:00
Alan Rominger
886ba1ea7f
Merge pull request #13860 from AlanCoding/move_test 
Move integration tests to be consistent with the rest
 2023-04-14 10:36:44 -04:00
Alex Corey
b128f05a37
Merge pull request #11076 from tongtie/fix-choose-project-scmType-manual-international 
fix: Internationalization causes the project to be unable to choose manual option
 2023-04-14 09:57:08 -04:00
Alan Rominger
36c9c9cdc4
Move integration tests to be consistent with the rest 2023-04-14 09:51:53 -04:00
Alan Rominger
342e9197b8
Customize application_name for different connections in dispatcher service (#13074) 
* Introduce new method in settings, import in-line w NOQA mark

* Further refine the app_name to use shorter service names like dispatcher

* Clean up listener logic, change some names
 2023-04-13 22:36:36 -04:00
John Westcott IV
2205664fb4
Merge pull request #13857 from john-westcott-iv/add_tacacs_plus 
Adding tacacs+ container for testing
 2023-04-13 16:15:32 -04:00
John Westcott IV
7cdf471894
Fix sat instance var (#13851) 
* add the fallback satellite_instance_var_id

* Removing unnecessary whitespace

---------

Co-authored-by: Nikhil Jain <jainnikhil30@gmail.com>
 2023-04-13 17:14:06 -03:00
John Westcott IV
8719648ff5 Adding tacacs+ container for testing 2023-04-13 15:02:08 -04:00
Dien Nguyen
c1455ee125
bugfix: add scm_branch to optional_args for workflow_launch (#13254) 
* add scm_branch to optional_args

* add in limits

* Update workflow_launch.py

remove json from import to pass linting.

---------

Co-authored-by: dien nguyen <nguyen.d@gmail.comn>
Co-authored-by: Jessica Steurer <70719005+jay-steurer@users.noreply.github.com>
 2023-04-13 15:36:38 -03:00
Joe Garcia
11d5e5c7d4
Fixes #13402 allow user defined key retrieval from CYBR (#13411) 
* Fixed #13402 allow user defined key retrieval from CYBR

* Add default value to object_property

* Raise ValueError if object_property not in response

* Raise KeyError instead of ValueError
 2023-04-13 13:11:37 -04:00