diff options
author | Scott Dodson <sdodson@redhat.com> | 2017-06-13 21:46:15 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-13 21:46:15 -0400 |
commit | 85a3806b57858b35b793b8391b67f88bfeec9e10 (patch) | |
tree | 01322684429cf6d9807582b0fb0d13dafb3107b4 /roles/calico_master/defaults | |
parent | 4dcd01577bc6f92ef6f1f294c4374a14e0895b96 (diff) | |
parent | 1720a5209dab342b84afd625cf609fe8fddf1f83 (diff) | |
download | openshift-85a3806b57858b35b793b8391b67f88bfeec9e10.tar.gz openshift-85a3806b57858b35b793b8391b67f88bfeec9e10.tar.bz2 openshift-85a3806b57858b35b793b8391b67f88bfeec9e10.tar.xz openshift-85a3806b57858b35b793b8391b67f88bfeec9e10.zip |
Merge branch 'master' into Upgrade_Calico_Version_to_2.2.1
Diffstat (limited to 'roles/calico_master/defaults')
-rw-r--r-- | roles/calico_master/defaults/main.yaml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/roles/calico_master/defaults/main.yaml b/roles/calico_master/defaults/main.yaml index 5b324bce5..b2df0105f 100644 --- a/roles/calico_master/defaults/main.yaml +++ b/roles/calico_master/defaults/main.yaml @@ -4,3 +4,4 @@ kubeconfig: "{{ openshift.common.config_base }}/master/openshift-master.kubeconf calicoctl_bin_dir: "/usr/local/bin/" calico_url_calicoctl: "https://github.com/projectcalico/calicoctl/releases/download/v1.1.3/calicoctl" +calico_url_policy_controller: "quay.io/calico/kube-policy-controller:v0.5.4" |