diff options
| author |   Michal Zegan <m.zegan@samsung.com> | 2019-06-05 18:20:22 +0200 |
|---|---|---|
| committer | Michal Zegan <m.zegan@samsung.com> | 2019-07-12 14:19:26 +0200 |
| commit | e53011361ee51031bc342bdcbb005a1d94f60bfd (patch) | |
| tree | ebe3e015927b6ef962ac85faf0564b1dc3c545ee | |
| parent | 0573ab24eb85e428cb1f1bb80b9956b1a790dcc6 (diff) | |
Remove kubectl install from prepare-rke
This is needed because prepare-kubectl role can do just the same.
Also fixed rke tests to match.
Change-Id: I808df650a5f755e09c26d13db62ecfc1504a317c
Issue-ID: OOM-1907
Signed-off-by: Michal Zegan <m.zegan@samsung.com>
| -rw-r--r-- | ansible/roles/rke/molecule/default/prepare.yml | 3 | ||||
| -rw-r--r-- | ansible/test/roles/prepare-rke/tasks/infra.yml | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/ansible/roles/rke/molecule/default/prepare.yml b/ansible/roles/rke/molecule/default/prepare.yml index 6bad2b80..b012790a 100644 --- a/ansible/roles/rke/molecule/default/prepare.yml +++ b/ansible/roles/rke/molecule/default/prepare.yml @@ -13,3 +13,6 @@ - role: prepare-rke vars: mode: infra + - role: prepare-kubectl + vars: + kubectl_install: true diff --git a/ansible/test/roles/prepare-rke/tasks/infra.yml b/ansible/test/roles/prepare-rke/tasks/infra.yml index e9971f77..6e7bcb96 100644 --- a/ansible/test/roles/prepare-rke/tasks/infra.yml +++ b/ansible/test/roles/prepare-rke/tasks/infra.yml @@ -8,9 +8,3 @@ get_url: url: "https://github.com/rancher/rke/releases/download/v{{ rke_version }}/rke_linux-amd64" dest: "{{ app_data_path }}/downloads/rke_linux-amd64" - -- name: "Install kubectl-{{ kubectl_version }}" - get_url: - url: "https://storage.googleapis.com/kubernetes-release/release/v{{ kubectl_version }}/bin/linux/amd64/kubectl" - dest: "/usr/local/bin/kubectl" - mode: 0755 |