summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Ptacek <m.ptacek@partner.samsung.com>2019-07-15 07:50:29 +0000
committerGerrit Code Review <gerrit@onap.org>2019-07-15 07:50:29 +0000
commit7e2bf8e071288b6d13764158977312f2da6759e9 (patch)
treec5db417756f6d0a67eccf98e4fbe6f2ecb93fcb0
parent050833974a65ce6000f887176e803e373bb2cace (diff)
parente53011361ee51031bc342bdcbb005a1d94f60bfd (diff)
Merge "Remove kubectl install from prepare-rke"
-rw-r--r--ansible/roles/rke/molecule/default/prepare.yml3
-rw-r--r--ansible/test/roles/prepare-rke/tasks/infra.yml6
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