diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-03-01 22:17:22 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-01 22:17:22 -0500 |
| commit | 2d52f7c89baae452f3012102ac0f22a071f8f4ce (patch) | |
| tree | feb36c4dd6e8a04fa14a24d88d36b6dacc0fa213 /roles/openshift_master/meta | |
| parent | 4a3e61e035e42a260e0bf59d1e0c891dc004d50d (diff) | |
| parent | 58818a6af147e457d56a1faf77b02d37bb538826 (diff) | |
| download | openshift-2d52f7c89baae452f3012102ac0f22a071f8f4ce.tar.gz openshift-2d52f7c89baae452f3012102ac0f22a071f8f4ce.tar.bz2 openshift-2d52f7c89baae452f3012102ac0f22a071f8f4ce.tar.xz openshift-2d52f7c89baae452f3012102ac0f22a071f8f4ce.zip | |
Merge pull request #3393 from srampal/contiv
Pull request for Contiv Ansible code integration into Openshift Ansible
Diffstat (limited to 'roles/openshift_master/meta')
| -rw-r--r-- | roles/openshift_master/meta/main.yml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/roles/openshift_master/meta/main.yml b/roles/openshift_master/meta/main.yml index 56af0cf36..af3e7eeec 100644 --- a/roles/openshift_master/meta/main.yml +++ b/roles/openshift_master/meta/main.yml @@ -42,3 +42,6 @@ dependencies: - role: nickhammond.logrotate - role: nuage_master when: openshift.common.use_nuage | bool +- role: contiv + contiv_role: netmaster + when: openshift.common.use_contiv | bool |