diff options
author | Scott Dodson <sdodson@redhat.com> | 2017-07-31 09:20:53 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-31 09:20:53 -0400 |
commit | 17f700a35653f549528507f3ce587be95311d61f (patch) | |
tree | bfdf8395fd451bd87fd56dbcaf868221bdbc5da1 /roles/contiv/meta | |
parent | 3be2748d87f7eda17ed8cec496bbbd11b311b076 (diff) | |
parent | b71f2782028ce7cf56614780a87faca31b9e42ac (diff) | |
download | openshift-17f700a35653f549528507f3ce587be95311d61f.tar.gz openshift-17f700a35653f549528507f3ce587be95311d61f.tar.bz2 openshift-17f700a35653f549528507f3ce587be95311d61f.tar.xz openshift-17f700a35653f549528507f3ce587be95311d61f.zip |
Merge pull request #4919 from srampal/contiv_1.1.1
Some automation fixes for contiv GUI/auth_proxy & vxlan mode
Diffstat (limited to 'roles/contiv/meta')
-rw-r--r-- | roles/contiv/meta/main.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/contiv/meta/main.yml b/roles/contiv/meta/main.yml index da6409f1e..a2c2f98a7 100644 --- a/roles/contiv/meta/main.yml +++ b/roles/contiv/meta/main.yml @@ -27,4 +27,4 @@ dependencies: etcd_peer_url_scheme: http when: contiv_role == "netmaster" - role: contiv_auth_proxy - when: (contiv_role == "netmaster") and (contiv_enable_auth_proxy == true) + when: contiv_role == "netmaster" |