Shane McDonald
51b0c51605
Remove local port binding for postgres in dev env
...
I dont think we need to bind this port at the host level. This will allow us to
run the galaxy_ng dev tooling side-by-side with AWX.
2020-06-17 13:34:55 -04:00
softwarefactory-project-zuul[bot]
5ca66ac806
Merge pull request #7317 from shanemcd/redis-root-group
...
Force containers in k8s to run under root group
Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
2020-06-16 23:41:42 +00:00
Ben Schmitz
ea175ac5b6
Allows for docker logger support
2020-06-16 08:29:43 -04:00
Shane McDonald
de82c613fc
Make tests pass with current versions of things
2020-06-15 23:13:44 -04:00
Shane McDonald
e035eea95a
Merge pull request #7188 from mo-saeed/devel
...
Reshape security context for AWX containers
2020-06-11 15:26:58 -04:00
Shane McDonald
423df6618d
Force containers in k8s to run under root group
...
Normally containers belong to the 'root' group, but for some reason the
downstream red hat scl redis image only belongs to the 'redis' group by default. This fixes that.
2020-06-10 13:40:15 -04:00
softwarefactory-project-zuul[bot]
2582036fc8
Merge pull request #7313 from kdelee/update_k8s_inv_docs
...
remove some references to memcached
Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
2020-06-10 16:33:08 +00:00
Ryan Petrello
e81ccf10df
set proper permissions for the redis socket
2020-06-10 11:36:09 -04:00
Elijah DeLee
6777b82d8e
remove reference to memcached in k8s inv
...
we don't have memcached container anymore
2020-06-10 11:08:49 -04:00
mosad
eb5970b4a1
merge and resolve conflicts
2020-06-10 16:01:17 +02:00
Rebeccah Hunter
b09d9cbe41
removed django-redis as a dependency
...
Co-authored-by: Shane McDonald <me@shanemcd.com>
2020-06-09 10:24:23 -04:00
Rebeccah
d2bbe7aa1a
remove memcache from everywhere and add djagno-redis to cover it
2020-06-09 10:24:23 -04:00
Shane McDonald
91dbc2de30
Add queue / instance group registration to heartbeat for k8s installs
...
There is some history here.
https://github.com/ansible/awx/pull/7190 <- This PR was an attempt at fixing a
bug notting ran into where some jobs on k8s installs would get stuck in Waiting
forever.
The PR mentioned above introduced a bug where there are no instance groups on a
fresh k8s-based install. This is because this process currently happens in the
launch scripts, before the database is up.
With this patch, queue / instance group registration happens in the heartbeat,
right after auto-registering the instance.
2020-06-06 08:58:35 -04:00
mo-saeed
0bfcacfcf4
Merge branch 'devel' into devel
2020-06-06 00:19:19 +02:00
mosad
1e6437b773
Resolve conflict 2
2020-06-06 00:17:26 +02:00
mosad
7d0c49c043
Fix conflict
2020-06-05 23:41:20 +02:00
softwarefactory-project-zuul[bot]
4a5edf7b88
Merge pull request #7184 from wenottingham/a-preview-of-whats-to-come
...
Remove dev env futzing of supervisord.conf permissions
Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
2020-06-04 21:47:02 +00:00
Bill Nottingham
64e3135754
Only build one awx image instead of separate web and task images
2020-06-03 10:48:48 -04:00
Bill Nottingham
559d917184
Make supervisor more consistent
...
Configs go in /etc, sockets in /var/run/supervisor for all invocations.
2020-06-02 19:51:16 -04:00
softwarefactory-project-zuul[bot]
9d42b8f0f2
Merge pull request #7189 from wenottingham/aaargh
...
Hardcode --kubeconfig and therefore only support OpenShift 3.11+
Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
2020-05-29 23:44:16 +00:00
softwarefactory-project-zuul[bot]
54167d9693
Merge pull request #7190 from shanemcd/less-bounce
...
Stop bouncing k8s deployment post-install
Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
2020-05-29 20:31:15 +00:00
mosad
4a9603a7ea
Allow priv container for awx_task and option to create psp
2020-05-29 20:24:49 +02:00
Shane McDonald
747fdf38d8
Stop bouncing k8s deployment post-install
...
We shouldnt need to do this now that RabbitMQ autoclustering is gone.
2020-05-29 13:47:33 -04:00
Bill Nottingham
0f0e401c98
Hardcode --kubeconfig and therefore only support OpenShift 3.11+
...
Avoid trying to parse inconsitent oc --version output
2020-05-29 13:41:49 -04:00
mosad
b13a175668
Reshape security context for AWX containers
2020-05-29 12:35:45 +02:00
Bill Nottingham
131f5ff018
Remove dev env futzing of supervisord.conf permissions
...
If we just link it into the dev env, we don't need to copy it at
startup, and we don't need write permissions on it.
2020-05-28 13:12:57 -04:00
mstrent
8d6d5eeed8
Add subnet configuratin to Docker Compose to avoid conflicts.
...
The out of the box subnet Docker Compose selects may conflict with your existing LAN subnets. This makes it configurable.
2020-05-28 09:17:45 -07:00
softwarefactory-project-zuul[bot]
d42f57d726
Merge pull request #7034 from tchellomello/ca_trust_dir
...
Fixes ca_trust_dir mapping for k8s and openshift
Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
2020-05-26 20:03:00 +00:00
softwarefactory-project-zuul[bot]
a306397586
Merge pull request #7077 from jakemcdermott/zuul-retry-chromium-download
...
Retry chromium download in zuul
Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
2020-05-19 20:35:19 +00:00
Jake McDermott
17efb34c6a
Retry chromium download in zuul
2020-05-19 10:19:38 -04:00
JoelKle
39c32fb5d0
AWX installer docker-compose params host_port
and host_port_ssl
...
can also be undefined to prevent exposing a port.
Signed-off-by: JoelKle <34544090+JoelKle@users.noreply.github.com>
2020-05-19 10:03:29 +02:00
Bill Nottingham
73b0506e96
Remove obsolete setting.
...
This hasn't been used for years now.
2020-05-18 17:41:15 -04:00
Ryan Petrello
54178a1982
stop pre-generating awx.egg-info
2020-05-15 11:47:53 -04:00
Shane McDonald
c370cb4d93
Get OpenShift / arbitrary user ids working again
2020-05-15 08:32:43 -04:00
Marcelo Moreira de Mello
736e7a33ac
Fixes ca_trust_dir mapping for k8s and openshift
...
Signed-off-by: Marcelo Moreira de Mello <tchello.mello@gmail.com>
2020-05-15 02:37:33 -04:00
Bill Nottingham
6924466c0b
Also precreate /venv in /dev with modifiable permissions.
2020-05-14 15:33:21 -04:00
Bill Nottingham
1808bed2e8
Add nss for the chrome UI unit tests
2020-05-14 15:32:06 -04:00
Bill Nottingham
d5817fd87a
Remove repo files no longer used in build process
2020-05-14 15:02:32 -04:00
Bill Nottingham
8b51e8eb82
Stage rsyslog.conf from existing version so we don't have two copies.
2020-05-14 15:02:32 -04:00
Bill Nottingham
66245d3094
Reorganize both dev and prod container builds
...
Use only one (templated) docker file for both builds.
Move to two-stage container builds in order to save space in the
final image.
2020-05-14 15:02:32 -04:00
Bill Nottingham
a057277823
Install config-watcher as 0755 rather than chmod'ing it later
2020-05-14 15:02:11 -04:00
Seth Foster
4da0e0dd80
Vendor collections for isolated jobs to work in ansible 2.10
...
kubectl and synchronize are now part of community.kubernetes
and ansible.posix collections, respectively. This change installs
these collections to a local directory to be used in inventory and
isolated management playbooks.
awx issue #6930
2020-05-13 10:41:01 -04:00
Ryan Petrello
086d6951b4
Merge branch 'downstream' into devel
2020-05-08 16:48:48 -04:00
Shane McDonald
a461df0e4d
Fix installer for oc 4.3
2020-05-06 11:40:07 -04:00
Christian Adams
c565130b35
TERM rsyslogd instead of KILL for more graceful shutdown
2020-05-05 15:38:57 -04:00
Shane McDonald
9be1fd56d2
Remove problematic variable
...
This is already here: https://github.com/ansible/awx/blob/devel/installer/roles/kubernetes/defaults/main.yml#L58
Was also causing downstream stuff to break.
2020-04-30 11:09:06 -04:00
softwarefactory-project-zuul[bot]
e940f1f7df
Merge pull request #6849 from ggiinnoo/ssl-seperate-key
...
Added variable to inventory to add a separate SSL key file
Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
2020-04-29 14:38:32 +00:00
softwarefactory-project-zuul[bot]
def3114b5b
Merge pull request #6856 from ryanpetrello/devel
...
merge in a few downstream fixes
Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
2020-04-28 17:21:28 +00:00
Ryan Petrello
aad371d224
Merge branch 'downstream' into devel
2020-04-28 12:18:13 -04:00
Vyacheslav Andreykiv
d5cb6ad58a
Update main.yml
...
Reverted formating changes
2020-04-28 08:56:29 -07:00