shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-10-30 22:21:13 +03:00
Code Releases Activity
18,986 Commits 40 Branches 19 Tags 380 MiB
6721ea54e9
Commit Graph

220 Commits

Author SHA1 Message Date
softwarefactory-project-zuul[bot]
6721ea54e9
Merge pull request #1956 from droopy4096/devel 
allow nginx config extension

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2018-10-11 22:38:36 +00:00
softwarefactory-project-zuul[bot]
99a42e91fe
Merge pull request #2235 from ChrisRo89/devel 
Extracted more variables which a related to rabbitmq/postgresql from tasks to defaults

Reviewed-by: Shane McDonald <me@shanemcd.com>
             https://github.com/shanemcd
 2018-10-11 21:54:38 +00:00
softwarefactory-project-zuul[bot]
9a580ba644
Merge pull request #2416 from fantashley/fix-openshift-auth 
Fix openshift auth broken by undefined vars

Reviewed-by: Ashley Nelson <fantashley@gmail.com>
             https://github.com/fantashley
 2018-10-11 21:51:20 +00:00
softwarefactory-project-zuul[bot]
74fcdabc22
Merge pull request #2156 from Decstasy/patch-1 
Bugfix for ca_trust_dir

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2018-10-11 21:31:45 +00:00
Ashley Nelson
9bec7cf3b0 Fix openshift auth broken by undefined vars 
Signed-off-by: Ashley Nelson <fantashley@gmail.com>
 2018-10-11 16:25:55 -05:00
softwarefactory-project-zuul[bot]
f79debac42
Merge pull request #2164 from atgreen/devel 
Fix token based openshift logins during installation - fixes #489

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2018-10-11 20:36:39 +00:00
softwarefactory-project-zuul[bot]
a9f3eeef05
Merge pull request #2131 from walkafwalka/docker_install_awx_hostnames 
Add inventory vars to set docker install hostnames

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2018-10-11 20:29:32 +00:00
softwarefactory-project-zuul[bot]
6f55cde6d3
Merge pull request #2091 from stoned/force_boolean_eval 
force boolean evaluation

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2018-10-11 20:17:48 +00:00
Ashley Nelson
2bf2412759 Add serviceName to Kubernetes StatefulSet spec 
Signed-off-by: Ashley Nelson <fantashley@gmail.com>
 2018-10-11 11:49:08 -05:00
Christian.Rohr
96ad2b2b28 Extracted more variables which a related to rabbitmq 2018-10-11 12:16:01 -04:00
Anthony Green
c39370dbd0 Fix token based openshift logins 2018-10-11 12:10:41 -04:00
Shane McDonald
ee1d5e43b9 Fix fallout from https://github.com/ansible/awx/pull/2392 
There were some upstream changes that I overwrote but shouldn’t have.
 2018-10-10 11:41:34 -04:00
Yanis Guenane
5d22fc2bd7
Merge branch 'devel' into non-root-docker-tests 2018-10-10 09:44:01 +02:00
Shane McDonald
de60165a49 Fix broken defaults in awx installer 2018-10-09 19:15:32 -04:00
Shane McDonald
b9279ebd5e Port downstream installer changes 2018-10-09 14:39:39 -04:00
Shane McDonald
b75f8ceca6 Do not default to pulling latest from DockerHub 2018-10-03 17:50:07 -05:00
Shane McDonald
bfc74497b0 Fix error in image_build role 
I think I derped up and commited something in an old stash.
 2018-10-03 14:44:26 -05:00
Shane McDonald
3701567ad7 Revert "first-parent requires git >= 1.8.4" 
This reverts commit 1af0ee2f8c.

# Conflicts:
#	installer/roles/image_build/templates/Dockerfile.j2
 2018-09-28 15:48:33 -04:00
Shane McDonald
86140dec08 Revert "Fix sdist builder image" 
This reverts commit 97472cb91b.

# Conflicts:
#	installer/roles/image_build/tasks/main.yml
 2018-09-28 15:48:33 -04:00
Shane McDonald
50fe0392ed Updates to versioning system. 
https://github.com/ansible/awx/issues?q=%22--first-parent%22
 2018-09-28 15:48:33 -04:00
Dmytro Makovey
f8d2a32756 merge and resolve conflict 2018-09-18 11:35:35 -07:00
Shane McDonald
1b4c3f56fa
Merge pull request #2113 from kialam/upgrade-node-lts 
Upgrade Node and NPM to LTS
 2018-09-18 12:46:30 -04:00
Shane McDonald
89e656b2a4 Update Node version in sdist builder 2018-09-18 12:17:52 -04:00
Shane McDonald
2b9954c373 Pull in downstream k8s installer changes 
- Secretification of secret stuff
- Backup / restore
 2018-08-14 12:37:19 -04:00
Shane McDonald
2e6a7205e7 Fix broken conditional 2018-08-14 11:19:15 -04:00
Matthew Jones
14685901aa skip migrations If an environment variable is set 
This is to help k8s/openshift migrations which will perform migrations
in a separate pod.
 2018-08-14 11:00:51 -04:00
Matthew Jones
4dcd379d1e Add some env variables to the web deployment 
This allows the start script to properly wait on services to come
online rather than getting stuck and waiting for the full timeout
 2018-08-13 13:27:00 -04:00
Ryan Petrello
18f6f68540
Merge remote-tracking branch 'tower/release_3.3.0' into devel 2018-08-10 11:54:34 -04:00
Dennis U
a294a6f06e
Bugfix for ca_trust_dir 
Changed syntax as ca_trust_dir was not correctly mounted in awx_web container and added command to update CA trust inside awx_web container after creation.
 2018-08-09 14:07:29 +02:00
Ryan Petrello
2d4fbffb91
set the correct X-Forwarded-Port header to fix SAML auth 
see: https://github.com/ansible/tower/issues/2314
 2018-08-07 10:07:06 -04:00
walkafwalka
d2ab7bd54d Add inventory vars to set docker install hostnames 
Signed-off-by: walkafwalka <41709139+walkafwalka@users.noreply.github.com>
 2018-08-04 01:49:07 -07:00
Shane McDonald
be7a40daf3 Fix syntax in nginx config 
Broke in 6f5259d017
 2018-08-02 11:24:51 -04:00
Ryan Petrello
6f5259d017
remove the network UI 2018-07-30 11:03:53 -04:00
Ryan Petrello
7588e65786
change openshift edge termination policy to redirect (enforce https) 
see: https://github.com/ansible/tower/issues/2591
related: https://docs.openshift.org/latest/architecture/networking/routes.html
 2018-07-27 10:34:07 -04:00
Stoned Elipot
ada2d65547 force boolean evaluation 2018-07-25 19:10:31 +02: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
Marcin Karkocha
a19df9b3b3 #2039 add tiller-namespace as argument 2018-07-02 12:33:26 +00:00
V.Gouvalas
1239195289 FIX nginx use selected log formatting 2018-06-28 14:09:13 +03:00
Ryan Petrello
471ff69257
stop setting celery's hostname dynamically (it's passed via the cli) 2018-06-19 12:16:00 -04:00
Ryan Petrello
88e3c46810
add a background process to spot celery hangs and reload the worker pool 
see: https://github.com/ansible/tower/issues/2085
 2018-06-11 12:22:21 -04:00
Will Thames
b899096f99 Use use-context to set Kubernetes context 
`kubectl config use-context` is the command to set the current context,
not `set-context`

Signed-off-by: Will Thames <will@thames.id.au>
 2018-06-06 13:02:26 +10:00
Dmytro Makovey
adaa164a19 allow nginx config extension 2018-06-05 08:16:08 -07:00
Matthew Jones
72f2994cc5
Merge branch 'release_3.3.0' into devel 2018-05-17 16:07:47 -04:00
chris meyers
ceedc135b2 add variables to inventory mentioned in docs 
* Also better error message when openshift cert failure
 2018-05-15 14:44:43 -04:00
Luis Gracia
8e85a57c1a AWX launchers should wait for other containers to be ready 2018-05-15 11:45:54 -04:00
Wayne Witzel III
5d016c0dcb
Merge pull request #1705 from benthomasson/network_ui_openshift_fix 
Adds websocket for network_ui to the installer version of nginx.conf
 2018-05-10 09:41:11 -04:00
Ben Thomasson
33ef12002f Adds websocket for network_ui to the installer version of nginx.conf 2018-05-07 13:42:29 -04:00
AlanCoding
59744e421f
send our oddball loggers to external logger too 2018-05-02 15:33:58 -04:00