summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLasse Kaihlavirta <l.kaihlavirt@partner.samsung.com>2021-03-17 09:24:03 +0000
committerGerrit Code Review <gerrit@onap.org>2021-03-17 09:24:03 +0000
commitbb4c4b55715ac2c4f5b10c4df8e7ea59f2c7deb2 (patch)
tree3a359c27ad088990c8862612b3f0d94ff3143235
parenta4c853ac9f21791e60f023d5a1d555bfd848a7e4 (diff)
parent2ec7d371de299c9e42abee088d50064193414433 (diff)
Merge "Upgrade rke version to 1.2.4 in Molecule setup"
-rw-r--r--ansible/roles/rke/molecule/default/prepare.yml3
-rw-r--r--ansible/test/roles/prepare-rke/defaults/main.yml4
2 files changed, 1 insertions, 6 deletions
diff --git a/ansible/roles/rke/molecule/default/prepare.yml b/ansible/roles/rke/molecule/default/prepare.yml
index d20f1962..d72d6bcf 100644
--- a/ansible/roles/rke/molecule/default/prepare.yml
+++ b/ansible/roles/rke/molecule/default/prepare.yml
@@ -12,6 +12,3 @@
- role: prepare-rke
vars:
mode: infra
- - role: prepare-kubectl
- vars:
- kubectl_install: true
diff --git a/ansible/test/roles/prepare-rke/defaults/main.yml b/ansible/test/roles/prepare-rke/defaults/main.yml
index 2cb05679..8a6749bb 100644
--- a/ansible/test/roles/prepare-rke/defaults/main.yml
+++ b/ansible/test/roles/prepare-rke/defaults/main.yml
@@ -1,5 +1,3 @@
---
#The rke version.
-rke_version: 1.0.4
-#The kubectl version.
-kubectl_version: 1.15.11
+rke_version: 1.2.4