noheat: Upgrades, refactor, deploy Devstack

[integration.git] / deployment / noheat / cluster-rke / ansible / roles / setup_k8s / tasks / main.yml

diff --git a/deployment/noheat/cluster-rke/ansible/roles/setup_k8s/tasks/main.yml b/deployment/noheat/cluster-rke/ansible/roles/setup_k8s/tasks/main.yml
index 53d7b81..7d3ba00 100644 (file)
--- a/deployment/noheat/cluster-rke/ansible/roles/setup_k8s/tasks/main.yml
+++ b/deployment/noheat/cluster-rke/ansible/roles/setup_k8s/tasks/main.yml
@@ -1,20 +1,6 @@
-- name: Download RKE
-  get_url:
-    url: "https://github.com/rancher/rke/releases/download/v{{ rke_version }}/rke_linux-amd64"
-    dest: "{{ ansible_user_dir }}/rke"
-    mode: '0700'
-
-- name: Prepare RKE configuration
-  template:
-    src: "cluster.yml.j2"
-    dest: "{{ ansible_user_dir }}/cluster.yml"
-    mode: '0400'
-
-- name: Run RKE
-  command:
-    cmd: "./rke up"
-    chdir: "{{ ansible_user_dir }}"
-    creates: "{{ ansible_user_dir }}/kube_config_cluster.yml"
+---
+- name: Deploy kubernetes with RKE
+  include_tasks: rke.yml
 
 - name: Create k8s directory
   file:
@@ -24,10 +10,7 @@
 
 - name: Set k8s config
   command: "mv {{ ansible_user_dir }}/kube_config_cluster.yml {{ ansible_user_dir }}/.kube/config"
+  when: rke_run and rke_run.rc == 0
 
-- name: Get kubectl
-  become: yes
-  get_url:
-    url: "https://dl.k8s.io/release/{{ k8s_version.split('-')[0] }}/bin/linux/amd64/kubectl"
-    dest: "/usr/local/bin/"
-    mode: '0555'
+- name: Install kubectl
+  include_tasks: kubectl.yml