External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-09-16 00:40:11 -02:30
Code Issues Packages Projects Releases Wiki Activity
31,282 Commits 63 Branches 102 Tags
604cbc17376620dc67df35386421835d43732a4e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Shane McDonald 60b6faff19 Merge pull request #11655 from ivarmu/devel 
Let an organization admin to add new users to it's tower organization
 2022-02-12 19:35:51 -05:00
Shane McDonald 750e1bd80a Merge pull request #11342 from shanemcd/custom-uwsgi-mount-path 
Allow for running AWX at non-root path (URL prefixing)
 2022-02-09 10:37:04 -05:00
Shane McDonald 54cbf13219 Merge pull request #11696 from sean-m-sullivan/awx_collection_role_update_v2 
add execution_environment_admin to role module
 2022-02-08 10:12:00 -05:00
Shane McDonald 6774a12c67 Merge pull request #11694 from shanemcd/scoped-schema 
Scope schema.json to target branch
 2022-02-08 09:48:08 -05:00
Shane McDonaldandJake McDermott 22d47ea8c4 Update port binding for UI dev tooling 
Jake says "Folks sometimes run the ui dev server independently of the tools_awx container"

Co-authored-by: Jake McDermott <9753817+jakemcdermott@users.noreply.github.com>
 2022-02-08 08:33:21 -05:00
Shane McDonald 6ed429ada2 Scope api schema.json to target branch 2022-02-07 17:54:01 -05:00
Shane McDonald 264f1d6638 Merge pull request #11685 from shanemcd/skip-pytest-7.0.0 
Skip pytest 7.0.0
 2022-02-04 16:09:42 -05:00
Shane McDonald 16c7908adc Skip pytest 7.0.0 
A test was failing with:

    from importlib.readers import FileReader
E   ModuleNotFoundError: No module named 'importlib.readers'
 2022-02-04 15:48:18 -05:00
Shane McDonald 489ee30e54 Simplify code that generates named URLS 2022-02-03 19:00:07 -05:00
Shane McDonald 2abab0772f Bind port for UI live reload tooling in development environmentt 
This allows for running:

```
docker exec -ti tools_awx_1 npm --prefix=awx/ui start
```
 2022-02-03 19:00:07 -05:00
Shane McDonald 0bca0fabaa Fix bug in named url middleware when running at non-root path 
The most notable change here is the removal of the conditional in
process_request. I don't know why we were preferring REQUEST_URI over
PATH_INFO. When the app is running at /, they are always the same as far as I
can tell. However, when using SCRIPT_NAME, this was incorrectly setting path and
path_info to /myprefix/myprefix/.
 2022-02-03 19:00:07 -05:00
Shane McDonald 93ac3fea43 Make UI work when not running at root path 2022-02-03 19:00:07 -05:00
Shane McDonald c72b71a43a Use relative paths for UI assets 
Found at https://create-react-app.dev/docs/deployment/#serving-the-same-build-from-different-paths
 2022-02-03 19:00:07 -05:00
Shane McDonald 9e8c40598c Allow for overriding UWSGI mount path 
This is just one piece of the puzzle as I try to add support for URL prefixing.
 2022-02-03 19:00:07 -05:00
Shane McDonald 4ded4afb7d Move production UWSGI config to a file 2022-02-03 19:00:07 -05:00
Shane McDonald a718e01dbf Merge pull request #11676 from shanemcd/automate-labels 
Automate labels with GHA
 2022-02-03 10:53:15 -05:00
Shane McDonald 8e6cdde861 Automate labels 2022-02-03 09:45:00 -05:00
Shane McDonald 15c7a3f85b Merge pull request #11673 from ansible/fix_dockerfile_kube_dev_deps 
Includes gettext on build-deps for multi-stage builds
 2022-02-02 15:31:54 -05:00
Shane McDonald 1ab7aa0fc4 Merge pull request #11662 from simaishi/remove_tower_setup_script 
Remove ansible-tower-setup script
 2022-02-01 15:25:00 -05:00
Shane McDonald 5950e0bfcb Merge pull request #11643 from john-westcott-iv/github_meta_changes 
GitHub meta changes
 2022-02-01 13:15:40 -05:00
Shane McDonald ecf9a0827d Merge pull request #11618 from fosterseth/ps_in_dev_image 
Install ps in dev image
 2022-01-31 12:42:59 -05:00
Shane McDonald ef7d5e6004 Merge pull request #11621 from ansible/update-minikube-dev-env-docs 
Update minikube dev environment docs
 2022-01-27 09:56:50 -05:00
Shane McDonald b678d61318 Merge pull request #11569 from zjzh/devel 
Update ad_hoc_commands.py
 2022-01-26 16:51:30 -05:00
Shane McDonald db401e0daa Merge pull request #11616 from shanemcd/hostname 
Install hostname in dev image
 2022-01-26 15:04:07 -05:00
Shane McDonald 675d4c5f2b Install hostname in dev image 2022-01-26 14:39:57 -05:00
Shane McDonald 5660f9ac59 Merge pull request #11514 from shanemcd/python39 
Upgrade to Python 3.9
 2022-01-26 10:59:14 -05:00
Shane McDonald 35ba321546 Unpin virtualenv version 2022-01-25 17:41:38 -05:00
Shane McDonald 2fe7fe30f8 Remove epel 
This doesnt seem to be needed anymore
 2022-01-25 17:39:42 -05:00
Shane McDonald af9eb7c374 Update timezone test 2022-01-24 12:21:28 -05:00
Shane McDonald 44968cc01e Upgrade to Python 3.9 2022-01-24 12:21:20 -05:00
Shane McDonald af69b25eaa Merge pull request #11332 from shanemcd/bump-deps 
Security-related updates for some Python dependencies.
 2022-01-24 12:13:53 -05:00
Shane McDonald eb33b95083 Merge pull request #11548 from shanemcd/revert-11428 
Revert "Make awx-python script available in k8s app images"
 2022-01-24 12:10:01 -05:00
Shane McDonald 381e75b913 Merge pull request #11562 from ansible/avoid_dups_create_preload_data 
Avoid duplicated entries when calling create_preload_data
 2022-01-18 19:00:43 -05:00
Shane McDonald 7bd516a16c Skip project update 2022-01-18 18:40:58 -05:00
Shane McDonald 9d636cad29 Revert "Make awx-python script available in k8s app images" 
This reverts commit 88bbd43314.
 2022-01-15 10:38:50 -05:00
Shane McDonald c035c12c0a Merge pull request #11380 from sean-m-sullivan/new_name 
add new name to multiple modules
 2022-01-11 01:42:55 +08:00
Shane McDonald 6e39a02e99 Merge pull request #11504 from sean-m-sullivan/devel 
add better error and documentation on labels
 2022-01-11 01:42:13 +08:00
Shane McDonald 35bac50962 Ensure docker pull commands fail gracefully 2021-12-08 15:51:14 -05:00
Shane McDonald 03ed6e9755 Merge pull request #11371 from shanemcd/document-release-process 
Document release process
 2021-11-19 18:43:53 +08:00
Shane McDonald 8d4e7f0a82 Document release process 2021-11-19 08:28:48 +00:00
Shane McDonald 7fdf491c05 Merge pull request #11369 from shanemcd/lets-automate-everything 
Automate the rest of our release process
 2021-11-19 11:37:58 +08:00
Shane McDonald ef1563283e An automated stage / promotion release process 2021-11-19 02:22:45 +00:00
Shane McDonald a206d79851 Merge pull request #11368 from shanemcd/downstream-changes 
A few more downstream fixes
 2021-11-19 09:46:21 +08:00
Shane McDonald e789e16289 Merge pull request #11348 from pabelanger/temp/sessionname 
Set SESSION_COOKIE_NAME by default
 2021-11-19 08:33:07 +08:00
Shane McDonald aad150cf1d Pin rsa package to latest version 2021-11-16 09:02:11 +00:00
Shane McDonald be13a11dd5 Merge pull request #11344 from Akasurde/typo 
Misc typo fix
 2021-11-16 16:52:30 +08:00
Shane McDonald 39370f1eab Security-related updates for some Python dependencies. 2021-11-14 08:45:49 +00:00
Shane McDonald aec7ac6ebd Merge pull request #11341 from shanemcd/fix-image-builds 
Fix official image builds
 2021-11-13 14:31:26 +08:00
Shane McDonald f6e63d0917 Fix official image builds 
I broke everything in https://github.com/ansible/awx/pull/11242.

These changes were necessary in order to run `awx-manage collectstatic` without a running database.
 2021-11-13 06:07:37 +00:00
Shane McDonald 481f6435ee Merge pull request #11327 from shanemcd/downstream-changes 
Pull in downstream changes
 2021-11-11 11:09:22 +08:00
Shane McDonald 1660900914 Dont fail CI when pre-built images arent available 
CI will build the image from scratch if the pre-build image is not available
 2021-11-10 08:50:08 +08:00
Shane McDonald 25140c9072 Merge pull request #11288 from bhavenst/devel 
Fix dev build (docker-compose) problems
 2021-10-28 12:54:13 -04:00
Shane McDonald 64b337e3c6 Dont re-run CI after merging PRs into devel 2021-10-19 11:24:28 -04:00
Shane McDonald f3669f3be6 Fix make install_collection 
The version obtained from setuptools_scm is not compatible with ansible-galaxy collection install.
 2021-10-19 10:26:23 -04:00
Shane McDonald 61eb99c46d Merge pull request #11253 from beeankha/collections_docs_fix_pt2 
Update auth_plugin Doc Extension File to Fix Malformed Collections Docs
 2021-10-18 18:07:41 -04:00
Shane McDonald 517f1d7991 Merge pull request #9491 from sezanzeb/awxkit-credential-file 
making the cli use AWXKIT_CREDENTIAL_FILE
 2021-10-13 19:05:56 -04:00
Shane McDonald 60a357eda1 Merge pull request #10906 from oweel/10829-idle_timeout_setting 
Added idle_timeout setting to job settings
 2021-10-13 13:16:53 -04:00
Shane McDonald 4ab2539c8a Merge pull request #11242 from shanemcd/awx-operator-ci-check 
Add awx-operator CI check
 2021-10-13 10:28:23 -04:00
Shane McDonald 3a74cc5a74 Add awx-operator CI check 2021-10-12 18:59:24 -04:00
Shane McDonald f1520e1a70 Allow for building headless mode 
This will only be used in CI and maybe other places where we dont need a UI
 2021-10-12 18:59:24 -04:00
Shane McDonald 727b4668c2 yamllint: ignore some gitignore'd directories 2021-10-12 18:59:24 -04:00
Shane McDonald 1287e001d8 yamllint: disable truthy rule 
This rule feels very anti-Ansible
 2021-10-12 18:59:23 -04:00
Shane McDonald c9b53cf975 Refactor image_build and image_push roles 
Primary changes are:

- Generalized variable names (remove "docker")
- Add explicit "push" variable rather than checking if the "registry" variable is defined.
- Allow for passing in version as build arg
 2021-10-12 18:59:13 -04:00
Shane McDonald cdf7fd64b2 Merge pull request #11230 from no-12/devel 
Fix survey update with job_template module
 2021-10-11 17:23:57 -04:00
Shane McDonald 84ffa4a5b7 Merge pull request #11189 from nntrn/pgsql-12 
Change pgsql version from 10 to 12 in template for dockerfile role
 2021-10-11 15:41:18 -04:00
Shane McDonald 326a43de11 Merge pull request #11231 from CastawayEGR/fix-awx-collection-spelling 
fix spelling of Vault
 2021-10-11 15:37:20 -04:00
Shane McDonald 7e404b7c19 Merge pull request #11199 from shanemcd/auto-version 
Remove VERSION files, obtain version from git tags.
 2021-10-06 20:14:06 -04:00
Shane McDonald f67a2d2f46 Make setup.py compatible with older pythons 
This caused some annoying downstream failures I'd rather not fix right now.
 2021-10-05 19:11:03 -04:00
Shane McDonald fcdda8d7a7 Remove old test comparing VERSION files 2021-10-05 19:11:03 -04:00
Shane McDonald 1f0b936e82 Remove VERSION files, obtain version from git tags. 2021-10-05 19:11:00 -04:00
Shane McDonald a036363e85 Merge pull request #11195 from shanemcd/update-pip-and-setuptools 
Update pip and setuptools
 2021-10-04 18:50:51 -04:00
Shane McDonald 4aceea41fd Update licensce test to work with newer pip 2021-10-04 17:41:48 -04:00
Shane McDonald 7bbfcbaefd Update dev requirements to work with setuptools 58 2021-10-04 16:24:16 -04:00
Shane McDonald d38c109d49 Update pip and setuptools 2021-10-04 13:07:16 -04:00
Shane McDonald 57c9b14198 Fix docker-compose targets 2021-10-03 13:40:26 -04:00
Shane McDonald 0736f4d166 Merge pull request #11187 from shanemcd/bump-19.4.0 
AWX 19.4.0
 2021-10-02 15:21:01 -04:00
Shane McDonald fed94b531d Merge pull request #11163 from gbaychev/patch-1 
Update websockets.md
 2021-10-02 15:17:03 -04:00
Shane McDonald 43a77e8667 Clean up unused parts of Makefile 2021-10-02 14:22:14 -04:00
Shane McDonald 637dc3844d Bump version 2021-10-02 14:15:54 -04:00
Shane McDonald 44466a3e76 Merge pull request #11077 from shanemcd/nightly-receptorctl 
Install receptorctl from new nightly url
 2021-09-24 11:40:29 -04:00
Shane McDonald ae06e9cb14 Merge pull request #10981 from kdelee/receptor_sos 
Capture /etc/receptor in sos report
 2021-08-30 19:56:11 -04:00
Shane McDonald 6c266b47e6 Merge pull request #10964 from shanemcd/more-ansible-please 
Automate release process and changelog generation
 2021-08-30 16:02:15 -04:00
Shane McDonald 0a7945a911 Remove unnecessary usage of set_fact. Thanks @samdoran! 2021-08-30 15:12:39 -04:00
Shane McDonald 9c3e78443b Hide the ugly parts in a custom action 2021-08-30 15:12:15 -04:00
Shane McDonald 1c65fbaae3 Update old changelog document to point to releases page. 2021-08-29 15:54:00 -04:00
Shane McDonald dc0cc0f910 Automate release process and changelog generation 2021-08-29 13:58:51 -04:00
Shane McDonald 274e487a96 Attempt to surface streaming errors that were being eaten (#10918) 2021-08-24 10:33:00 -04:00
Shane McDonald 460c7c3379 Allow for dynamically scaling automation mesh in dev env 2021-08-24 08:41:32 -04:00
Shane McDonald b7c0f02cb1 Merge pull request #10915 from rooftopcellist/fix-make-target 
Add new COMPOSE_UP_PRE_OPTS variable to docker-compose up target
 2021-08-19 13:04:23 -04:00
Shane McDonald aefc28a0ed Update README.md 2021-08-18 09:45:00 -04:00
Shane McDonald f102b0ccf9 Add support for running CI checks directly on devel branch 2021-08-18 09:31:39 -04:00
Shane McDonald 55e37f6229 Update ci.yml 2021-08-18 09:07:30 -04:00
Shane McDonald 9da383fe2d Merge pull request #10866 from ansible/fix-awx-ee-name 
Fix name of default awx ee
 2021-08-12 08:06:34 -04:00
Shane McDonald 7505ecd284 Merge pull request #10865 from shanemcd/19.3.0 
Bump version and changelog
 2021-08-11 21:02:26 -04:00
Shane McDonald a22de5a9ee Bump version and changelog 2021-08-11 19:51:06 -04:00
Shane McDonald aa98a5b5e1 Merge pull request #10858 from rooftopcellist/devel-receptor-runner 
Install receptor and ansible-runner from devel branch
 2021-08-11 16:43:13 -04:00
Shane McDonald 41321d8ad5 Merge pull request #10716 from oweel/10392-return_404_ad_hoc_command_events 
Return 404 for ad_hoc_command_events list api. Remove api endtpoint
 2021-07-23 17:35:57 -04:00
Shane McDonald 09479be4ba Merge pull request #10738 from shanemcd/fix-docker-clean-volumes 
Fix docker-clean-volumes target when not using minikube
 2021-07-23 11:06:13 -04:00
Shane McDonald 18a51d1dd0 Fix docker-clean-volumes target when not using minikube 
Without this patch, you get:

```
tools/docker-compose-minikube/_sources/minikube delete
make: tools/docker-compose-minikube/_sources/minikube: No such file or directory
```
 2021-07-23 09:09:33 -04:00
Shane McDonald 7882cb9008 Merge pull request #10668 from oweel/devel 
Fix ignoring --no-color for awx-manage list_instances command
 2021-07-22 20:46:02 -04:00