shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 16:51:11 +03:00
Code Releases Activity
19,720 Commits 40 Branches 19 Tags 380 MiB
39d119534c
Commit Graph

247 Commits

Author SHA1 Message Date
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
Ilkka Tengvall
0443bd3099
fixes selinux permissions for awx data. 
fixes issue #2036 and  #1896
 2018-07-02 09:22:36 +03: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
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
Matthew Jones
d04bbde3c2
Merge pull request #1786 from shanemcd/devel 
Fix image build role when not deploying to localhost
 2018-04-20 13:46:50 -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
Engin Vardar
6b06d1896e Install unzip to enable usage of unarchive module 
Signed-off-by: Engin Vardar <enginvardar@gmail.com>
 2018-04-20 09:17:27 +02: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
cf5149ecf4 Use Deployment on Kubernetes 
I messed this up when rebasing.
 2018-04-18 10:28:50 -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
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
Matthew Jones
62e2be9c4b
Merge pull request #1722 from avantassel/devel 
Added nginx_status to nginx.conf
 2018-04-05 11:26:53 -04:00
Andrew Van Tassel
84329fc735
Update nginx.conf (#1) 
* Update nginx.conf

Added nginx_status, Sysdig is relentless...
 2018-04-03 11:24:30 -06:00
Ben Thomasson
43601be8a7 Removes --fake-initial from awx-manage migrate. 
The --fake-initial option is no longer needed and can cause
application with an initial migration to fail as was seen
in the network_ui application.
 2018-04-02 15:34:39 -04:00
Soumik Ghosh
41c3e69450
Bind mount to custom certs to 2018-04-02 14:23:23 -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
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
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
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
Jake McDermott
4a8f24becc
update reference to role file path to work with roles dir 2018-03-23 12:43:13 -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
Antony PERIGAULT
3adcdb43ad Replace deprecated -U option by --become-user 2018-03-21 12:28:27 +01:00
Martin Adler
ca7b6ad648
Corrected alternate dns servers entries 
As lstrip_blocks: True was added, this broke the formating when adding alternate DNS servers within the template. Removing the extra white space removals within the if and endif statements fixed the resulting yml formating.
 2018-03-19 21:08:52 +01:00
Ryan Petrello
a1f15362ab
Merge pull request #1575 from aperigault/fix_nginx_upstreams 
Fix nginx upstreams
 2018-03-16 14:53:48 -04:00
Antony PERIGAULT
8cf1c1a180 Fix nginx configuration to avoid ipv6 resolutions errors 2018-03-15 17:54:51 +01:00
Matthew Jones
3ba7095ba4
Fixing some issues defining resource requests in openshift and k8s 
* Allow overriding all container resource requests by setting defaults/
* Fix an issue where template vars were reversed in the deployment config
* Remove `limit` usage to allow for resource ballooning if it's available
* Fix type error when using templated values in the config map for resources
 2018-03-15 12:00:53 -04:00
Matthew Jones
cec77964ac
Merge pull request #1563 from matburt/container_cluster_capacity 
Implement container-cluster aware capacity determination
 2018-03-14 12:06:25 -07:00
Christian Adams
2abf4ccf3b
Merge pull request #1562 from rooftopcellist/python_saml_upgrade 
add xmlsec flag to docker installs
 2018-03-14 14:53:26 -04:00
Matthew Jones
b0cf4de072
Implement container-cluster aware capacity determination 
* Added two settings values for declaring absolute cpu and memory
  capacity that will be picked up by the capacity utility methods
* installer inventory variables for controlling the amount of cpu and
  memory container requests/limits for the awx task containers
* Added fixed values for cpu and memory container requests for other
  containers
* configmap uses the declared inventory variables to define the
  capacity inputs that will be used by AWX to correspond to the same
  inputs for requests/limits on the deployment.
 2018-03-14 14:35:45 -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
adamscmRH
8d460490c1 add xmlsec flag to docker installs 2018-03-14 14:28:35 -04:00
Alexander Bauer
709cb0ae2b fixup! Add local_docker facility for bind-mounting ca-trust 2018-03-14 10:52:36 -04:00
Alexander Bauer
db8df5f724 Add local_docker facility for bind-mounting ca-trust 
This implements one possible solution for #411, but does not solve it for
Kubernetes or Openshift installations.

# Conflicts:
#	installer/inventory
 2018-03-14 10:52:36 -04:00
jeff
4fa0d2406a Remove unneeded jinja endif 2018-03-14 15:16:26 +01:00
jeff
f9f91ecf81 Add ca_trust_dir to task image 2018-03-14 11:41:10 +01:00
jeff
aca74d05ae Add 'ca_trust_dir' variable to allow Custom CA sharing between host and containers 2018-03-14 11:40:56 +01:00
chris meyers
a4859a929c autoscale celery up to 50 workers 2018-03-12 15:36:15 -04:00
jeff
4972755ccb Fix project_data_dir templating for local_docker install 2018-03-12 14:50:44 +01:00
jffz
ca27dee4fc
Fix dns and dns_search templating 
Fix templating for dns and dns_search entries for both `awx_web` and `awx_task` images.

Multiple entries were templated in a oneliner style while docker-compose wanted them in a list style.
 2018-03-09 11:04:26 +01: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
adamscmRH
0490bca268 add csrf & session settings 2018-03-07 09:32:24 -05:00
Matthew Jones
e99184656e
Apply rabbitmq and setting kubernetes changes post-celery rollback 2018-03-05 16:22:27 -05:00
Matthew Jones
105b82c436
Apply celery rollback changes to kubernetes configmap 2018-03-05 15:32:24 -05:00
Chris Meyers
f18d99d7a9
Merge pull request #1409 from chrismeyersfsu/openshift_runtime_rabbitmq_cookie 
dynamically set rabbitmq cookie
 2018-03-01 09:57:11 -05:00
chris meyers
9436e8ae25 dynamically set rabbitmq cookie 2018-03-01 09:23:45 -05:00
Shane McDonald
0e9a8d5592 Fix celery 3 broker url reference 2018-02-28 12:47:05 -05:00
Jake McDermott
877cde9a7f
add default cookie settings 2018-02-27 20:40:41 -05:00
adamscmRH
69f8304643 adds csrf flag to support http 2018-02-27 16:19:46 -05:00
Chris Meyers
d551566b4d
Merge pull request #1372 from chrismeyersfsu/old-celery3 
celery 4.x to 3.x roll back
 2018-02-27 15:26:46 -05:00
chris meyers
148baf7674 add explicit awx_celery container version 2018-02-27 11:37:10 -05:00
chris meyers
5918fa5573 remove () from postgres port value 
* awx task container uses postgres port to wait for postgres to become
available before the container init continues. The () are problematic
and are removed.
* () was originally added to fix an openshift issues. That error does
NOT occur with this fix.
 2018-02-27 11:36:55 -05:00
chris meyers
e4470aa4cf remove uneeded celery configs 
* Celery routes and queues are set and defined at runtime. Thus, a
static definition of routes and queues is not needed.
 2018-02-27 11:36:55 -05:00
chris meyers
fe05b4c0d5 use celery 3.x BROKER_URL 
* Celery 4.x specifies the broker via CELERY_BROKER_URL. Since we are
now on 3.x, use 3.x way of specifying the broker via BROKER_URL
 2018-02-27 11:36:55 -05:00
Ryan Petrello
7741de5153
set $HOME via an API call so AWX_TASK_ENV isn't marked as readonly 
see: https://github.com/ansible/awx/issues/1315
 2018-02-26 16:35:36 -05:00
Vadim Rutkovsky
5e25859069 Allow authenticating with Openshift via a token 2018-02-18 16:24:16 +01:00
Shane McDonald
6b3ca32827 Fix wait_fors in standalone Docker installs 2018-02-08 15:08:44 -05:00
Jeff Geerling
19f0b9ba92 Fix grammar for tasks - replace 'state' with 'stage'. 2018-02-06 16:57:59 -06:00
Shane McDonald
dce934577b Fix variable reference in k8s etcd template 2018-02-03 10:29:53 -05:00
Matthew Jones
6a85fc38dd
Add scalable cluster kubernetes support 2018-02-01 16:57:09 -05:00
Matthew Jones
d9e774c4b6
Updates for automatic triggering of policies 
* Switch policy router queue to not be "tower" so that we don't
  fall into a chicken/egg scenario
* Show fixed policy list in serializer so a user can determine if
  an instance is manually managed
* Change IG membership mixin to not directly handle applying topology
  changes. Instead it just makes sure the policy instance list is
  accurate
* Add create/delete hooks for instances and groups to trigger policy
  re-evaluation
* Update policy algorithm for fairer distribution
* Fix an issue where CELERY_ROUTES wasn't renamed after celery/django
  upgrade
* Update unit tests to be more explicit
* Update count calculations used by algorithm to only consider
  non-manual instances
* Adding unit tests and fixture
* Don't propagate logging messages from awx.main.tasks and
  awx.main.scheduler
* Use advisory lock to prevent policy eval conflicts
* Allow updating instance groups from view
 2018-02-01 16:56:16 -05:00
Matthew Jones
c819560d39
Add automatic deprovisioning support, only enabled for openshift 
* Implement a config watcher for service restarts
* If the configmap bind point changes then restart all services
 2018-02-01 16:51:40 -05:00