diff options
| author | Jan Chaloupka <jchaloup@redhat.com> | 2017-05-17 10:32:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-17 10:32:07 +0200 |
| commit | 415b1233d09c2f38dffe3b73b59152f2fadd1888 (patch) | |
| tree | 2828b1fd88fa78772447905f30e6388185927366 | |
| parent | bbb54088844b862e6c0b28b1606d3ca3cea76490 (diff) | |
| parent | df72177ecfc8d03cb29d6f3d7c612f6f198aa4a9 (diff) | |
| download | openshift-415b1233d09c2f38dffe3b73b59152f2fadd1888.tar.gz openshift-415b1233d09c2f38dffe3b73b59152f2fadd1888.tar.bz2 openshift-415b1233d09c2f38dffe3b73b59152f2fadd1888.tar.xz openshift-415b1233d09c2f38dffe3b73b59152f2fadd1888.zip | |
Merge pull request #4144 from VincentS/Calico_Remove_Hardcoded_URLs
Removed Hardcoded URLs in Calico Role
| -rw-r--r-- | roles/calico/defaults/main.yaml | 4 | ||||
| -rw-r--r-- | roles/calico/tasks/main.yml | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/roles/calico/defaults/main.yaml b/roles/calico/defaults/main.yaml index a81fc3af7..a16a7da71 100644 --- a/roles/calico/defaults/main.yaml +++ b/roles/calico/defaults/main.yaml @@ -4,7 +4,11 @@ etcd_endpoints: "{{ hostvars[groups.oo_first_master.0].openshift.master.etcd_url 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" diff --git a/roles/calico/tasks/main.yml b/roles/calico/tasks/main.yml index 287fed321..abdbcf8d6 100644 --- a/roles/calico/tasks/main.yml +++ b/roles/calico/tasks/main.yml @@ -46,14 +46,14 @@ - name: Download Calico CNI Plugin become: yes get_url: - url: https://github.com/projectcalico/cni-plugin/releases/download/v1.5.5/calico + url: "{{ calico_url_cni }}" dest: "{{ cni_bin_dir }}" mode: a+x - name: Download Calico IPAM Plugin become: yes get_url: - url: https://github.com/projectcalico/cni-plugin/releases/download/v1.5.5/calico-ipam + url: "{{ calico_url_ipam }}" dest: "{{ cni_bin_dir }}" mode: a+x @@ -61,7 +61,7 @@ become: yes unarchive: remote_src: True - src: https://github.com/containernetworking/cni/releases/download/v0.4.0/cni-amd64-v0.4.0.tgz + src: "{{ cni_url }}" dest: "{{ cni_bin_dir }}" - name: Assure Calico conf dir exists |