diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-06-05 16:56:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-05 16:56:05 -0400 |
| commit | 8fe2c75baeb8b83f7b2df738a6efbc2adae38428 (patch) | |
| tree | a62d4d4e20422574a0cb202d499e5aee842654b5 /roles/calico/defaults/main.yaml | |
| parent | 6df334d749921eb03f141bbafcc88e1eb95e8578 (diff) | |
| parent | 854a77ce23135f0ef27c79338b48aa53e49d8202 (diff) | |
| download | openshift-8fe2c75baeb8b83f7b2df738a6efbc2adae38428.tar.gz openshift-8fe2c75baeb8b83f7b2df738a6efbc2adae38428.tar.bz2 openshift-8fe2c75baeb8b83f7b2df738a6efbc2adae38428.tar.xz openshift-8fe2c75baeb8b83f7b2df738a6efbc2adae38428.zip | |
Merge pull request #4267 from ozdanborne/byo-etcd
Merged by openshift-bot
Diffstat (limited to 'roles/calico/defaults/main.yaml')
| -rw-r--r-- | roles/calico/defaults/main.yaml | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/roles/calico/defaults/main.yaml b/roles/calico/defaults/main.yaml index 03c612982..c7eea46f2 100644 --- a/roles/calico/defaults/main.yaml +++ b/roles/calico/defaults/main.yaml @@ -1,15 +1,10 @@ --- kubeconfig: "{{openshift.common.config_base}}/node/{{ 'system:node:' + openshift.common.hostname }}.kubeconfig" -etcd_endpoints: "{{ hostvars[groups.oo_first_master.0].openshift.master.etcd_urls | join(',') }}" cni_conf_dir: "/etc/cni/net.d/" cni_bin_dir: "/opt/cni/bin/" cni_url: "https://github.com/containernetworking/cni/releases/download/v0.4.0/cni-amd64-v0.4.0.tgz" -calico_etcd_ca_cert_file: "/etc/origin/calico/calico.etcd-ca.crt" -calico_etcd_cert_file: "/etc/origin/calico/calico.etcd-client.crt" -calico_etcd_key_file: "/etc/origin/calico/calico.etcd-client.key" - calico_url_cni: "https://github.com/projectcalico/cni-plugin/releases/download/v1.5.5/calico" calico_url_ipam: "https://github.com/projectcalico/cni-plugin/releases/download/v1.5.5/calico-ipam" |