diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-03-09 11:33:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-09 11:33:44 -0500 |
| commit | 20aa8f8919d335042568cb3e6b75aa8fd7a490bb (patch) | |
| tree | 6960956521d059ad1be43e5d962727a0ce0ec85b /roles/contiv/defaults/main.yml | |
| parent | 39e84a426f511d0f415e9b241de0f97bce4faa46 (diff) | |
| parent | b24037e7f761b18a6de4841503732a9372d3900c (diff) | |
| download | openshift-20aa8f8919d335042568cb3e6b75aa8fd7a490bb.tar.gz openshift-20aa8f8919d335042568cb3e6b75aa8fd7a490bb.tar.bz2 openshift-20aa8f8919d335042568cb3e6b75aa8fd7a490bb.tar.xz openshift-20aa8f8919d335042568cb3e6b75aa8fd7a490bb.zip | |
Merge pull request #3586 from srampal/issue3541
Fix for issue 3541
Diffstat (limited to 'roles/contiv/defaults/main.yml')
| -rw-r--r-- | roles/contiv/defaults/main.yml | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/roles/contiv/defaults/main.yml b/roles/contiv/defaults/main.yml index c2b72339c..1ccae61f2 100644 --- a/roles/contiv/defaults/main.yml +++ b/roles/contiv/defaults/main.yml @@ -2,11 +2,18 @@ # The version of Contiv binaries to use contiv_version: 1.0.0-beta.3-02-21-2017.20-52-42.UTC +# The version of cni binaries +cni_version: v0.4.0 + contiv_default_subnet: "20.1.1.1/24" contiv_default_gw: "20.1.1.254" # TCP port that Netmaster listens for network connections netmaster_port: 9999 +# Default for contiv_role +contiv_role: netmaster + + # TCP port that Netplugin listens for network connections netplugin_port: 6640 contiv_rpc_port1: 9001 @@ -33,6 +40,14 @@ bin_dir: /usr/bin # Path to the contivk8s cni binary cni_bin_dir: /opt/cni/bin +# Path to cni archive download directory +cni_download_dir: /tmp + +# URL for cni binaries +cni_bin_url_base: "https://github.com/containernetworking/cni/releases/download/" +cni_bin_url: "{{ cni_bin_url_base }}/{{ cni_version }}/cni-{{ cni_version }}.tbz2" + + # Contiv config directory contiv_config_dir: /opt/contiv/config |