16668 Commits

Author SHA1 Message Date
Shane McDonald
ffc347bfd0
Merge pull request #1771 from shanemcd/kubernetes-role-cleanup
Kubernetes role cleanup
2018-04-17 11:16:46 -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
0055c2ffff
Merge pull request #1760 from AlanCoding/fix_tests_25
Fix tests fallout from 2.5 upgrade
2018-04-16 15:51:11 -04:00
AlanCoding
de07ef0680
fix tests fallout from 2.5 upgrade 2018-04-13 16:01:11 -04:00
Shane McDonald
b0425d524c
Merge pull request #1754 from ansible/fix-docker-compose-template
Fix whitespace issues with docker-compose jinja template
2018-04-11 12:38:09 -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
Bill Nottingham
538bf40f96
Merge pull request #1735 from paneu/devel
Fix trivial UI typo
2018-04-05 14:00:58 -04:00
Paul Neumann
c11c9abcaa Fix trivial UI typo 2018-04-05 19:32:31 +02: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
Jared Tabor
77d3d5f5cb
Merge pull request #1725 from jaredevantabor/fix-1648
Increases the angular-tz-extension tag in package.json
2018-04-03 23:00:42 +00:00
Jared Tabor
f70917df64
Increases the angular-tz-extension tag in package.json
The angular-tz-extensions was changed to accomodate for an issue with
UTC dates not getting parsed correctly.
2018-04-03 15:38:45 -07: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
Shane McDonald
3cb37b131b
Merge pull request #1702 from shanemcd/postgresql-persistent-template
Customizable template for OpenShift PostgreSQL deployment
2018-03-28 16:37:02 -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
84e3bcc031
Merge pull request #1701 from shanemcd/devel
Move rabbitmq_version out of inventory file
2018-03-28 12:47: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
c1e1bf32d0
Merge pull request #1699 from shanemcd/rabbitmq-3.7
Upgrade to RabbitMQ 3.7, remove need for etcd2
2018-03-28 12:14:54 -04:00
Jared Tabor
ed86828a6f
Merge pull request #1691 from jaredevantabor/fix-1687
Reverts DeleteJob factory, fixes null provider to stdout pages
2018-03-28 08:54:31 -07: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
3f685c42fe
Merge pull request #1693 from shanemcd/consolidate-roles
Consolidate OpenShift and Kubernetes roles
2018-03-28 11:37:12 -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
Wayne Witzel III
3936b5e7a3
Merge pull request #1690 from ryanpetrello/coc
add a link to the community code of conduct
2018-03-28 08:55:57 -04:00
Jared Tabor
f10281e9ef
Reverts DeleteJob factory, fixes null provider to stdout pages
and removing unnecessary console.logs in app.js
2018-03-27 14:21:39 -07:00
Ryan Petrello
d9a0029ef7 add a link to the community code of conduct 2018-03-27 16:51:30 -04:00
Ryan Petrello
96f85c4dd5
Merge pull request #1689 from ryanpetrello/security-issue-template
more issue template updates
2018-03-27 11:47:12 -04:00
Ryan Petrello
14886af969 more issue template updates 2018-03-27 11:44:25 -04:00
Ryan Petrello
4ea97c0f86
Merge pull request #1688 from ryanpetrello/security-issue-template
add instructions for responsible disclosure of security issues
2018-03-27 11:42:13 -04:00
Ryan Petrello
e6d4aead65 add instructions for responsible disclosure of security issues 2018-03-27 11:38:22 -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
Matthew Jones
9637058406
Merge pull request #1512 from chrismeyersfsu/feature-new_ldap_group_type
add ldap group type like posixGroupType
2018-03-26 12:29:01 -07:00
Matthew Jones
d6203b521f
Merge pull request #1679 from mabashian/workflow-node-start-bug
Fixed js error when adding first workflow node
2018-03-26 12:20:38 -07:00
Matthew Jones
d685815478
Merge pull request #1607 from AlanCoding/tower_verify_field
Sync tower verify_ssl parameter with tower-cli
2018-03-26 12:12:45 -07:00
Matthew Jones
71d2a4b4cf
Merge pull request #1610 from AlanCoding/group_related
Include related Jobs in group deletion protection
2018-03-26 12:09:45 -07:00
mabashian
6c321f810a Tweaked isRoot logic to follow the same pattern as the rest of the function 2018-03-26 15:00:33 -04:00
mabashian
2c1fe14206 Fixed js error when adding first workflow node 2018-03-26 14:55:01 -04:00
Alan Rominger
3411721a2c
Merge pull request #1676 from AlanCoding/unused_settings
Removed unused settings (replaced by source_vars)
2018-03-26 14:16:42 -04:00
AlanCoding
9db0fdfc0b
sync tower verify_ssl parameter with tower-cli
Add new input for the tower type credential
elsewhere, tests are being added for verify_ssl in modules
tower-cli also updating to use the original tower.py var
2018-03-26 13:42:52 -04:00
Chris Meyers
09babbe862
Merge pull request #1677 from chrismeyersfsu/fix-traceback_msg
call celery method with celery context
2018-03-26 13:03:32 -04:00
John Mitchell
b1cd7dbd2f
Merge pull request #1678 from jlmitch5/removeTowerLicenseDir
remove tower-license dir
2018-03-26 12:17:58 -04:00
John Mitchell
02a97a2ec2
update .gitignore to include root tower-license dir 2018-03-26 12:13:00 -04:00
Alan Rominger
e38955e1fa
Merge pull request #1670 from AlanCoding/no_credential
Inventory source can_change - remove credential check
2018-03-26 12:06:57 -04:00