Shane McDonald ee1d5e43b9 Fix fallout from https://github.com/ansible/awx/pull/2392 ...

There were some upstream changes that I overwrote but shouldn’t have.

2018-10-10 11:41:34 -04:00

..

defaults

Fix fallout from https://github.com/ansible/awx/pull/2392

2018-10-10 11:41:34 -04:00

tasks

Port downstream installer changes

2018-10-09 14:39:39 -04:00

templates

Fix fallout from https://github.com/ansible/awx/pull/2392

2018-10-10 11:41:34 -04:00

vars

Consolidate OpenShift and Kubernetes roles

2018-03-28 11:36:08 -04:00