External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-12 18:40:01 -03:30
Code Issues Packages Projects Releases Wiki Activity
17,672 Commits 54 Branches 19 Tags
Commit Graph

182 Commits

Author SHA1 Message Date
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
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
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