diff options
| author | Jan Chaloupka <jchaloup@redhat.com> | 2017-05-18 14:51:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-18 14:51:33 +0200 |
| commit | b1c0247fdeb01f46e885c57cd272786d00ac8490 (patch) | |
| tree | e5fb5d2af7675c3fd2c5f78889baef63b9486d64 | |
| parent | e748591d96c64560c94f141a178b9f719a28721a (diff) | |
| parent | 79be1600a8002765957cfa3148171cfd4c71d434 (diff) | |
| download | openshift-b1c0247fdeb01f46e885c57cd272786d00ac8490.tar.gz openshift-b1c0247fdeb01f46e885c57cd272786d00ac8490.tar.bz2 openshift-b1c0247fdeb01f46e885c57cd272786d00ac8490.tar.xz openshift-b1c0247fdeb01f46e885c57cd272786d00ac8490.zip | |
Merge pull request #4143 from VincentS/calicoctl_role
Added Calicoctl to deployment of Master Nodes when Calico is used
| -rw-r--r-- | roles/calico_master/defaults/main.yaml | 4 | ||||
| -rw-r--r-- | roles/calico_master/tasks/main.yml | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/roles/calico_master/defaults/main.yaml b/roles/calico_master/defaults/main.yaml index db0d17884..5b324bce5 100644 --- a/roles/calico_master/defaults/main.yaml +++ b/roles/calico_master/defaults/main.yaml @@ -1,2 +1,6 @@ --- kubeconfig: "{{ openshift.common.config_base }}/master/openshift-master.kubeconfig" + +calicoctl_bin_dir: "/usr/local/bin/" + +calico_url_calicoctl: "https://github.com/projectcalico/calicoctl/releases/download/v1.1.3/calicoctl" diff --git a/roles/calico_master/tasks/main.yml b/roles/calico_master/tasks/main.yml index 3358abe23..74d3bf0fe 100644 --- a/roles/calico_master/tasks/main.yml +++ b/roles/calico_master/tasks/main.yml @@ -39,3 +39,10 @@ resource_kind: scc resource_name: privileged state: present + +- name: Download Calicoctl + become: yes + get_url: + url: "{{ calico_url_calicoctl }}" + dest: "{{ calicoctl_bin_dir }}" + mode: a+x |