External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-09-16 08:50:10 -02:30
Code Issues Packages Projects Releases Wiki Activity
18,717 Commits 65 Branches 102 Tags
6cf1fb3c10e0bad240308d67d528610a2f9edb12
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Shane McDonald 047b5755bf Merge pull request #2170 from matburt/fix_web_wait_deployment 
Add some env variables to the web deployment
 2018-08-13 13:32:22 -04:00
Shane McDonald 61c21c5ac0 Merge pull request #2808 from wwitzel3/release_3.3.0 
disable computed for create preload data mgmt cmd
 2018-08-09 10:14:52 -04:00
Shane McDonald 1c32df0fcd Move django-oauth-toolkit into requirements_git.txt 
All SCM based requirements need to go into this file because of how we built Ansible Tower (offline).
 2018-08-06 19:00:54 -04:00
Shane McDonald 090b3fad8e Update translation template files 2018-08-03 15:07:19 -04:00
Shane McDonald f6aee3dd41 Fix error in Dutch translation file 2018-08-02 12:30:16 -04:00
Shane McDonald c97edaf9e0 Merge pull request #2744 from shanemcd/release_3.3.0 
Fix syntax in nginx config
 2018-08-02 11:26:49 -04:00
Shane McDonald be7a40daf3 Fix syntax in nginx config 
Broke in 6f5259d017
 2018-08-02 11:24:51 -04:00
Shane McDonald b8a51244e4 Extract latest strings 2018-08-02 11:23:32 -04:00
Shane McDonald 3cc35fc598 Pull updated localization files 2018-08-02 11:23:32 -04:00
Shane McDonald 795f26e7b9 Lock down version of setuptools_scm 
This was causing offline pip installs to fail for some weird reason:

The 'setuptools_scm>=1.15.0' distribution was not found and is required by the application

Even though it is there. v2.x still works.
 2018-07-27 15:28:41 -04:00
Shane McDonald 8f7931e02f Merge pull request #2076 from john-westcott-iv/fix_node_link 
Change node.js macOS installer link (old link was dead)
 2018-07-18 12:21:11 -04:00
Shane McDonald 65a5f2dc9b Merge pull request #2052 from robruma/feature/callback_script_enhancement 
Adding ability to ignore SSL certificate validation errors, cleanup p…
 2018-07-16 13:13:51 -04:00
Shane McDonald 467a1fafcc Merge pull request #1880 from luisico/compose-web-wait-for 
AWX launchers should wait for other containers to be ready
 2018-07-16 13:11:06 -04:00
Shane McDonald ad33dff6af Merge pull request #1949 from willthames/k8s_use_context 
Use use-context to set Kubernetes context
 2018-07-16 12:59:36 -04:00
Shane McDonald 9b941e8b05 Merge pull request #2040 from kivio/tiller-namespace-configuration 
#2039 add tiller-namespace as argument
 2018-07-16 10:10:23 -04:00
Shane McDonald 3f8b80e415 Merge pull request #2028 from basos9/fix-nginx-log 
FIX nginx use selected log formatting
 2018-07-16 09:47:05 -04:00
Shane McDonald 93ddda13fd Merge pull request #2216 from ansible/rollback-task-reaper-pr 
Revert "fix celery task reaper"
 2018-06-18 19:24:29 -04:00
Shane McDonald 4f5a0d5a08 Merge pull request #1994 from taylorsmithgg/patch-1 
Update INSTALL.md
 2018-06-18 14:15:45 -04:00
Shane McDonald 8aa651faba Update translations 2018-06-14 14:37:18 -04:00
Shane McDonald 246e63bdb6 Update translation templates 2018-05-31 10:53:57 -04:00
Shane McDonald cb91b97fd0 Update pot files 2018-05-07 17:35:14 -04:00
Shane McDonald 17b6051233 Merge pull request #1826 from shanemcd/update-install-docs 
Update install docs
 2018-04-30 12:05:11 -04:00
Shane McDonald 6f4ef29ae7 Update install docs 
- Document openshift_skip_tls_verify
- Document openshift_pg_emptydir
- Add minimum minishift specs
- Move minishift section below variable reference
 2018-04-30 12:02:57 -04:00
Shane McDonald 4fdf462b98 Merge branch 'release_3.3.0' into awx/devel 
# Conflicts:
#	awx/ui/client/src/standard-out/standard-out-factories/main.js
#	awx/ui/package.json
 2018-04-27 10:17:59 -04:00
Shane McDonald 5313e069ca Merge pull request #1799 from shanemcd/devel 
Fix Helm PostgreSQL deployment name
 2018-04-25 11:22:39 -04:00
Shane McDonald e5faf0798f Always pull memcached image 2018-04-25 11:17:37 -04:00
Shane McDonald e623c3d7cd Don’t hardcode Helm PostgreSQL deployment name 2018-04-25 11:17:26 -04:00
Shane McDonald e2deab485e Merge pull request #1776 from enginvardar/devel 
Install unzip for awx_task docker image to enable usage of unarchive …
 2018-04-20 09:11:23 -04:00
Shane McDonald 98a9e82d2d Fix image build role when not deploying to localhost 2018-04-20 00:07:25 -04:00
Shane McDonald 590d5ccad1 Merge pull request #1718 from soumikgh/devel 
Bind mount to custom certs to `source/anchors` subfolder
 2018-04-19 22:33:36 -04:00
Shane McDonald f4f22dc585 Merge pull request #1777 from shanemcd/devel 
Use Deployment on Kubernetes
 2018-04-18 10:32:40 -04:00
Shane McDonald cf5149ecf4 Use Deployment on Kubernetes 
I messed this up when rebasing.
 2018-04-18 10:28:50 -04:00
Shane McDonald ffc347bfd0 Merge pull request #1771 from shanemcd/kubernetes-role-cleanup 
Kubernetes role cleanup
 2018-04-17 11:16:46 -04:00
Shane McDonald 40d7751fbd Remove image push logic from installer roles 
I’m going to be reusing this code on the Tower side, and I’m trying to refactor some of the AWX specific bits out. There will probably be more to come, but this is a good start.
 2018-04-16 19:01:43 -04:00
Shane McDonald 2b6fe7969f Move rabbitmq and memcached images into variables 2018-04-16 17:43:15 -04:00
Shane McDonald 0786b41ac6 Allow for customizing kubernetes deployment name 2018-04-16 17:43:15 -04:00
Shane McDonald 479a56c6d3 Generalize variable names in installer 
secret_key
 2018-04-16 17:43:15 -04:00
Shane McDonald e4a6fc55df Remove unused variable from inventory 2018-04-16 15:51:36 -04:00
Shane McDonald bebc37b3eb Set kubernetes_namespace when deploying on OpenShift 
kubernetes_namespace is referenced later it the role but may not be set if deploying on openshift
 2018-04-16 15:51:36 -04:00
Shane McDonald 534b2f1601 Fix openshift_pg_emptydir logic 2018-04-16 15:51:36 -04:00
Shane McDonald db02bd7531 Remove explicit nodePort declarations for RabbitMQ service 
This lets Kubernetes handle the port mapping, which resolves a port collision issue when running multiple deployments of AWX in a single cluster.
 2018-04-16 15:51:36 -04:00
Shane McDonald e9ddf7b9db Use a DeploymentConfig in OpenShift 2018-04-16 15:51:36 -04:00
Shane McDonald 0055c2ffff Merge pull request #1760 from AlanCoding/fix_tests_25 
Fix tests fallout from 2.5 upgrade
 2018-04-16 15:51:11 -04:00
Shane McDonald b0425d524c Merge pull request #1754 from ansible/fix-docker-compose-template 
Fix whitespace issues with docker-compose jinja template
 2018-04-11 12:38:09 -04:00
Shane McDonald 3720c57c63 Fix whitespace issues with docker-compose jinja template 
See https://github.com/ansible/awx/issues/1710
 2018-04-11 11:06:34 -04:00
Shane McDonald 3cb37b131b Merge pull request #1702 from shanemcd/postgresql-persistent-template 
Customizable template for OpenShift PostgreSQL deployment
 2018-03-28 16:37:02 -04:00
Shane McDonald 1ef7d73bc9 Customizable template for OpenShift PostgreSQL deployment 
`oc new-app --template=postgresql-persistent` has been kind of a pain. It would attempt to create a Persistent Volume, but does not allow you to specify the storageClass.

This code assumes that a Persistent Volume is already available and will fail with a helpful error message if it is not.

Signed-off-by: Shane McDonald <me@shanemcd.com>
 2018-03-28 16:25:43 -04:00
Shane McDonald 84e3bcc031 Merge pull request #1701 from shanemcd/devel 
Move rabbitmq_version out of inventory file
 2018-03-28 12:47:43 -04:00
Shane McDonald c8ea03e67b Move rabbitmq_version out of inventory file 
Signed-off-by: Shane McDonald <me@shanemcd.com>
 2018-03-28 12:45:05 -04:00
Shane McDonald c1e1bf32d0 Merge pull request #1699 from shanemcd/rabbitmq-3.7 
Upgrade to RabbitMQ 3.7, remove need for etcd2
 2018-03-28 12:14:54 -04:00
Shane McDonald 935dc8bca7 Upgrade to RabbitMQ 3.7, remove need for etcd2 
Signed-off-by: Shane McDonald <me@shanemcd.com>
 2018-03-28 11:45:33 -04:00
Shane McDonald 3f685c42fe Merge pull request #1693 from shanemcd/consolidate-roles 
Consolidate OpenShift and Kubernetes roles
 2018-03-28 11:37:12 -04:00
Shane McDonald 98f5dc3fcc Consolidate OpenShift and Kubernetes roles 
Signed-off-by: Shane McDonald <me@shanemcd.com>
 2018-03-28 11:36:08 -04:00
Shane McDonald 7002c6f1b1 Delete unused namespace file 
Signed-off-by: Shane McDonald <me@shanemcd.com>
 2018-03-27 10:57:22 -04:00
Shane McDonald 3072c3bd8d Whitespace fix 
Signed-off-by: Shane McDonald <me@shanemcd.com>
 2018-03-27 10:57:22 -04:00
Shane McDonald 1595947ae2 Merge pull request #1663 from jakemcdermott/fix-docker-installer-paths 
update reference to role file path to work with installer roles dir
 2018-03-23 12:43:54 -04:00
Shane McDonald caf576cac0 Merge pull request #1655 from shanemcd/devel 
Move installer roles into roles directory
 2018-03-22 14:39:03 -04:00
Shane McDonald 84cd933702 Move installer roles into roles directory 
Signed-off-by: Shane McDonald <me@shanemcd.com>
 2018-03-22 14:34:03 -04:00
Shane McDonald 0d86e646ec Merge pull request #1100 from rooftopcellist/fix_upgrade_python_saml24 
fix_python_saml24_update
 2018-03-22 11:48:24 -04:00
Shane McDonald f8b5318206 Merge pull request #1093 from rooftopcellist/upgrade_python_saml 
upgrade python-saml for CVE fix
 2018-03-21 12:27:35 -04:00
Shane McDonald 2af085e1fe Merge pull request #1552 from jffz/devel 
Add ca_trust_dir to local docker installations
 2018-03-14 14:32:55 -04:00
Shane McDonald 7984bd2824 Merge pull request #1493 from jffz/devel 
Fix for dns and dns_search templating
 2018-03-09 12:52:10 -05:00
Shane McDonald 5bf2e00d24 Merge pull request #1471 from shanemcd/devel 
Fix container boots on AppArmor protected systems
 2018-03-08 09:44:33 -05:00
Shane McDonald 02102f5ba8 Fix container boots on AppArmor protected systems 
Link https://github.com/ansible/awx/issues/1297

Signed-off-by: Shane McDonald <me@shanemcd.com>
 2018-03-08 09:41:04 -05:00
Shane McDonald 2861397433 Set imagePullPolicy to Always 
Not sure why we werent doing this before.
 2018-03-08 09:41:04 -05:00
Shane McDonald 61087940c5 Merge pull request #1446 from matburt/fix_kubernetes_configmap 
Apply celery rollback changes to kubernetes configmap
 2018-03-05 16:46:57 -05:00
Shane McDonald 44f6423af3 Merge pull request #1442 from ryanpetrello/devel 
fix busted shippable builds
 2018-03-05 14:38:35 -05:00
Shane McDonald d5773c58d3 Merge pull request #1426 from chrismeyersfsu/fix-migration_in_progress 
short-circuit middleware if migration loading url
 2018-03-03 10:48:50 -05:00
Shane McDonald 7087341570 Merge pull request #1397 from shanemcd/devel 
Fix celery 3 broker url reference in standalone docker install
 2018-02-28 12:50:57 -05:00
Shane McDonald 0e9a8d5592 Fix celery 3 broker url reference 2018-02-28 12:47:05 -05:00
Shane McDonald c612ab1c89 Merge pull request #1327 from marshmalien/fix/bump-angular-scheduler-version 
Bump angular-scheduler version to 0.3.2
 2018-02-22 13:55:07 -05:00
Shane McDonald c0fe6866c4 Merge pull request #1070 from vrutkovs/installer-ocp-token 
Allow authenticating with Openshift via a token
 2018-02-22 13:40:01 -05:00
Shane McDonald 476dbe58c5 Merge pull request #1183 from ryanpetrello/swagger 
normalize dates in the Swagger output to minimize diffs
 2018-02-09 10:18:19 -05:00
Shane McDonald 6b3ca32827 Fix wait_fors in standalone Docker installs 2018-02-08 15:08:44 -05:00
Shane McDonald 48300da443 Merge pull request #1163 from ryanpetrello/swagger 
add indention to swagger docs
 2018-02-08 10:52:47 -05:00
Shane McDonald 1e9b0c2786 Merge pull request #1130 from shanemcd/fix-etcd-template 
Fix variable reference in k8s etcd template
 2018-02-05 09:18:20 -05:00
Shane McDonald dce934577b Fix variable reference in k8s etcd template 2018-02-03 10:29:53 -05:00
Shane McDonald 426e901cdf Merge pull request #1089 from KAMiKAZOW/patch-1 
Fix CentOS typo in CONTRIBUTING.md
 2018-01-30 21:11:10 -05:00
Shane McDonald 87365e5969 Merge pull request #1071 from jakemcdermott/set-selenium-container-image-tags 
use selenium hub / node container image version '3.8.1-erbium'
 2018-01-28 16:37:03 -05:00
Shane McDonald b8cba916a5 Merge pull request #1069 from tdgroot/develop-dockerfile_rsync 
Add rsync to Dockerfile
 2018-01-27 10:14:36 -05:00
Shane McDonald fefa4a8bf4 Merge pull request #1049 from ansible/jakemcdermott-fix-1045 
add minimum git version to install guide
 2018-01-24 15:40:10 -05:00
Shane McDonald 797169317c Merge pull request #1037 from shanemcd/devel 
Use newer version of git in dev image
 2018-01-22 14:43:09 -05:00
Shane McDonald 67c6591f6f Use newer version of git in dev image 
More fallout from #982
 2018-01-22 13:57:44 -05:00
Shane McDonald 09d63b4883 Merge pull request #1029 from jakemcdermott/fix-navbar 
fix navbar / breadcrumb issue
 2018-01-19 13:54:56 -05:00
Shane McDonald cad5c5e79a Merge pull request #987 from shanemcd/devel 
Fix sdist builder image
 2018-01-15 20:25:16 -05:00
Shane McDonald 97472cb91b Fix sdist builder image 
Fallout from https://github.com/ansible/awx/pull/982
 2018-01-15 15:39:48 -05:00
Shane McDonald 7d51b1cb9d Merge pull request #982 from shanemcd/devel 
Use first parent commit when determining version from tags
 2018-01-15 11:04:23 -05:00
Shane McDonald 52e531625c Use first parent commit when determining version from tags 
We were having issues where an older tag was being outputed from `git describe`.

From the man page:

Follow only the first parent commit upon seeing a merge commit. This is useful when you wish to not match tags on branches merged in the history of the target commit.
 2018-01-15 11:01:47 -05:00
Shane McDonald 54d3412820 Merge pull request #942 from wwitzel3/devel 
Update asgi-amqp requirement
 2018-01-09 19:17:45 -05:00
Shane McDonald 00ce244716 Merge pull request #822 from jakemcdermott/fix-merge-issues 
fix merge issue with inventory source service
 2017-12-13 13:32:13 -05:00
Shane McDonald 47e422ba7a Merge pull request #819 from ansible/jakemcdermott-patch-1 
fix arg name clash in hosts list controller
 2017-12-13 13:02:47 -05:00
Shane McDonald 334d47f3ab Pull updated translations 2017-12-11 09:42:06 -05:00
Shane McDonald ec14ae1930 Add m2r to setup requirements file 
We `pip download` this file for offline installs. Automat lists this package as a setup_requires, but `pip download` doesn’t resolve these dependencies (distutils will attempt to install them via easy_install when setup.py is invoked).
 2017-12-05 15:26:56 -05:00
Shane McDonald 15e8fd5eca Pull updated translations 2017-12-05 14:17:18 -05:00
Shane McDonald 3cd80ef67a Update pot files 2017-11-30 15:29:29 -05:00
Shane McDonald 32fcb84cf6 Merge pull request #722 from jakemcdermott/tools-awx-pycrypto 
add pycrypto distro package to tools awx container image
 2017-11-28 13:42:02 -05:00
Shane McDonald e2aa9dc599 Merge pull request #658 from shanemcd/devel 
Enable image stream lookups in AWX OpenShift Project
 2017-11-15 13:21:51 -05:00
Shane McDonald a043369d07 Enable image stream lookups in AWX OpenShift Project 
See the OpenShift docs on this for more info: https://docs.openshift.com/container-platform/3.6/dev_guide/managing_images.html#using-is-with-k8s

If you are not using OpenShift’s internal registry you will need to manually set awx_task_openshift_image and awx_web_openshift_image.
 2017-11-15 13:15:56 -05:00
Shane McDonald 0d86678a44 Fix OpenShift configmap 
These variables changed in 8faf588775
 2017-11-14 11:32:05 -05:00
Shane McDonald 386382c456 Merge pull request #619 from wwitzel3/devel 
Fix installer references to asgi_amqp
 2017-11-13 14:10:58 -05:00