diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-06-18 22:21:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-18 22:21:48 -0400 |
| commit | 865b3511d3df6fa5d938dda72e9d748c6c615c76 (patch) | |
| tree | d28a590c30f208d9436e5aee3802dd4ea259e94a /roles/contiv/meta | |
| parent | 9545204f504f1dcf3de18272dc1fb951dd15f486 (diff) | |
| parent | 76d1ee25b7570add1531ba232c46977d7201a122 (diff) | |
| download | openshift-865b3511d3df6fa5d938dda72e9d748c6c615c76.tar.gz openshift-865b3511d3df6fa5d938dda72e9d748c6c615c76.tar.bz2 openshift-865b3511d3df6fa5d938dda72e9d748c6c615c76.tar.xz openshift-865b3511d3df6fa5d938dda72e9d748c6c615c76.zip | |
Merge pull request #4329 from srampal/rhel_ose_aci
Merged by openshift-bot
Diffstat (limited to 'roles/contiv/meta')
| -rw-r--r-- | roles/contiv/meta/main.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/roles/contiv/meta/main.yml b/roles/contiv/meta/main.yml index 3223afb6e..da6409f1e 100644 --- a/roles/contiv/meta/main.yml +++ b/roles/contiv/meta/main.yml @@ -26,3 +26,5 @@ dependencies: etcd_url_scheme: http etcd_peer_url_scheme: http when: contiv_role == "netmaster" +- role: contiv_auth_proxy + when: (contiv_role == "netmaster") and (contiv_enable_auth_proxy == true) |