diff options
author | Sanjeev Rampal <srampal@cisco.com> | 2017-02-23 12:25:34 -0800 |
---|---|---|
committer | Sanjeev Rampal <srampal@cisco.com> | 2017-02-27 21:04:48 -0800 |
commit | 58818a6af147e457d56a1faf77b02d37bb538826 (patch) | |
tree | 6f9f4faaf19ae4fbac83979048aa327849609469 /roles/contiv/files | |
parent | c7f83e208ee433da74b7eb26644b30684a69649b (diff) | |
download | openshift-58818a6af147e457d56a1faf77b02d37bb538826.tar.gz openshift-58818a6af147e457d56a1faf77b02d37bb538826.tar.bz2 openshift-58818a6af147e457d56a1faf77b02d37bb538826.tar.xz openshift-58818a6af147e457d56a1faf77b02d37bb538826.zip |
Combined (squashed) commit for all changes related to adding Contiv support into Openshift Ansible. This is the first (beta) release of Contiv with Openshift and is only supported for Openshift Origin + Bare metal deployments at the time of this commit. Please refer to the Openshift and Contiv official documentation for details of the level of support for different features and modes of operation.
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 |