Shane McDonald
c370cb4d93
Get OpenShift / arbitrary user ids working again
2020-05-15 08:32:43 -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
ggiinnoo
0bad717db7
Wrong syntax
2020-04-28 17:51:41 +02:00
ggiinnoo
41a8d32dcc
Added variable to inventory to add a separate key file
2020-04-28 11:13:47 +02:00
Vyacheslav Andreykiv (Intel)
7659ffca1e
fixed ingress template
2020-04-27 14:33:42 -07:00
Christian Adams
c07b6285da
Increase stopwait time for rsyslogd service
2020-04-27 14:33:46 -04:00
softwarefactory-project-zuul[bot]
83051e9138
Merge pull request #6005 from donomur/ca-trust-fix
...
Add CA trust volume to k8s installer management pod
Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
2020-04-27 17:36:20 +00:00
softwarefactory-project-zuul[bot]
33ff4ad9be
Merge pull request #6762 from shaynecm/devel
...
Update inventory file
Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
2020-04-27 17:34:55 +00:00
Donovan Murphy
fb567dad1e
add CA trust volume to management pod
...
Signed-off-by: Donovan Murphy <dono@dono.email>
2020-04-27 13:01:32 -04:00
Dennis Vestergaard Værum
fd2d0966e2
If pg_hostname is defined don't try to upgrade PostgreSQL
2020-04-27 12:12:37 -04:00
softwarefactory-project-zuul[bot]
c0e07198cf
Merge pull request #6283 from AlanCoding/vendoring_collections
...
Use vendored collections for inventory imports
Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
2020-04-23 18:54:50 +00:00
Bill Nottingham
47fef1dcf3
Don't use SCLs for openshift.
...
This may be a mis-merge?
2020-04-22 17:16:44 -04:00
Christian Adams
8d3ce206cd
rsyslogd is only needed in the web container
2020-04-22 10:17:04 -04:00
shaynecm
e42915d4cf
updated to include py3
...
amended to be "/usr/bin/env python3" as suggested
2020-04-21 12:40:56 +01:00
shaynecm
1afd8b4309
Update inventory
2020-04-20 19:20:14 +01:00
Ryan Petrello
7bfc99a615
don't expose redis port
2020-04-17 15:34:11 -04:00
AlanCoding
fcf75af6a7
Get current cloud sources working from collection
...
update test data files
Adopt official vendor location
openstack not published yet
Add collections to show paths
Add collections loc to installer settings
Add vendored collections to show path again
2020-04-16 20:55:59 -04:00
Yanis Guenane
541b9607f5
Collections: Adding a requirements.yml file
2020-04-16 20:55:59 -04:00
softwarefactory-project-zuul[bot]
e19194b883
Merge pull request #6721 from shanemcd/dockerfile-cleanup
...
Dockerfile organization
Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
2020-04-16 14:48:58 +00:00
Shane McDonald
29a582f869
Dockerfile organization
2020-04-15 14:43:59 -04:00
Christian Adams
85960d9035
Volume mount supervisor dir to both containers
2020-04-15 14:11:15 -04:00
Christian Adams
c8ceb62269
Rename awx rsyslog socket and PID dir
2020-04-15 14:11:15 -04:00
softwarefactory-project-zuul[bot]
2ba1288284
Merge pull request #6695 from ryanpetrello/memcached-cleanup
...
don't wait on memcached TCP
Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
2020-04-14 16:40:52 +00:00
Ryan Petrello
75bb7cce22
don't wait on memcached TCP
2020-04-14 11:45:27 -04:00
Ryan Petrello
0f74a05fea
rsyslogd: ignore /dev/log when we load imuxsock
2020-04-14 11:34:58 -04:00
Ryan Petrello
f7f1bdf9c9
properly configure supervisorctl to point at the web volume mount
2020-04-13 21:56:52 -04:00
Ryan Petrello
69cf915a20
add rsyslogd block to the k8s supervisord config file
2020-04-13 20:25:53 -04:00
Ryan Petrello
9440785bdd
properly set the group on the rsyslog config
2020-04-13 19:46:34 -04:00
Christian Adams
ca7c840d8c
Fix permissions on rsyslog.conf for k8s
2020-04-13 19:33:23 -04:00
Christian Adams
a0e31b9c01
Map logging timeout value to healthchecktimeout for http in rsyslog config
2020-04-13 15:22:16 -04:00
Ryan Petrello
e52cebc28e
rsyslogd: use %rawmsg-after-pri% instead of %msg%
...
after some prolonged RFC reading and tinkering w/ rsyslogd...
cpython's SysLogHandler doesn't emit RFC3164 formatted messages
in the format you'd expect; it's missing the ISO date, hostname, etc...
along with other header values; the handler implementation relies on you
to specify a syslog-like formatter (we've replaced all of this with our
own *custom* logstash-esque formatter that effectively outputs valid JSON
- without dates and other syslog header values prepended)
because of this unanticipated format, rsyslogd chokes when trying to
parse the message's parts; AWX is emitting:
<priority>RAWJSON
...so the usage of `%msg%` isn't going to work for us, because rsyslog
tries to parse *all* of the possible headers (and yells, because it
can't find a date to parse):
see: https://www.rsyslog.com/files/temp/doc-indent/configuration/properties.html#message-properties
this is fine, because we don't *need* any of that message parsing
anyways; in the end, we're *just* interested in forwarding the raw
JSON/text content to the third party log handler
2020-04-13 11:44:00 -04:00
Christian Adams
5d54877183
Add action to default rsyslog.conf so supervisor starts correctly the first time
2020-04-13 11:44:00 -04:00
Christian Adams
b942fde59a
Ensure log messages have valid json
...
- Fix messages getting contatenated at 8k
- Fix rsyslog cutting off the opening brace of log messages
- Make valid default conf and emit logs based on prescence of .sock and
settings
2020-04-13 11:44:00 -04:00
Christian Adams
70391f96ae
Revert rsyslog valid config to one that fails intentionally
2020-04-13 11:43:59 -04:00
Christian Adams
2329c1b797
Add rsyslog config to container from file for consistency
2020-04-13 11:43:59 -04:00
Christian Adams
e740340793
ConfigMap rsyslog conf files for k8
2020-04-13 11:43:59 -04:00