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/contiv/files | |
| 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/contiv/files')
| -rw-r--r-- | roles/contiv/files/contiv_cni.conf | 5 | ||||
| -rw-r--r-- | roles/contiv/files/loopback | bin | 0 -> 3909976 bytes |
2 files changed, 5 insertions, 0 deletions
diff --git a/roles/contiv/files/contiv_cni.conf b/roles/contiv/files/contiv_cni.conf new file mode 100644 index 000000000..441dffd41 --- /dev/null +++ b/roles/contiv/files/contiv_cni.conf @@ -0,0 +1,5 @@ +{ + "cniVersion": "0.1.0", + "name": "contiv-net", + "type": "contivk8s" +} diff --git a/roles/contiv/files/loopback b/roles/contiv/files/loopback Binary files differnew file mode 100644 index 000000000..f02b0b1fb --- /dev/null +++ b/roles/contiv/files/loopback |