diff --git a/ansible/bootstrap.yml b/ansible/bootstrap.yml index 1f3715dc0958b69f705f2efdb3683998f0fb072f..158f846b45caa628d99ad0fd2c85cab8b19002b1 100644 --- a/ansible/bootstrap.yml +++ b/ansible/bootstrap.yml @@ -17,6 +17,7 @@ tags: ['get_control'] - role: configure_helmfile tags: ['configure_helmfile'] - # This also runs the rke_configuration role. + - role: rke_configuration + tags: ['rke_configuration'] - role: setup tags: ['setup'] diff --git a/ansible/roles/rke_configuration/files/rke_linux_amd64_0.1.16 b/ansible/roles/rke_configuration/files/rke_linux_amd64_0.1.16 new file mode 100755 index 0000000000000000000000000000000000000000..5eb53860998566d40f6911d8086b8be7267910b2 Binary files /dev/null and b/ansible/roles/rke_configuration/files/rke_linux_amd64_0.1.16 differ diff --git a/ansible/roles/rke_configuration/tasks/main.yml b/ansible/roles/rke_configuration/tasks/main.yml index c67b38ecd6fde9d2cabc8907cc52ee02a09e6e9b..bf534c322b16a00bb46d6d37ea622f1c2dfd3933 100644 --- a/ansible/roles/rke_configuration/tasks/main.yml +++ b/ansible/roles/rke_configuration/tasks/main.yml @@ -1,6 +1,22 @@ --- +- name: Install rke binary + copy: + dest: /usr/local/bin/rke + src: rke_linux_amd64_0.1.16 + mode: '0755' + +- name: Create directory to contain rke configuration + file: + path: "/oas/control/local/rke" + state: directory + become: true + - name: Copy rke cluster configuration file + vars: + rke_configuration_location: "/oas/control/local/rke/cluster.yml" + rke_ssh_key_path: "/oas/config/ssh_key" + rke_ssh_agent_auth: "false" template: src: "cluster.yml.j2" dest: "{{ rke_configuration_location }}" diff --git a/ansible/roles/setup/tasks/main.yml b/ansible/roles/setup/tasks/main.yml index 84b529207284c07fc500b40ba354660106cd445c..9d65f1f4fbf7faee386bb5826da79178e1644194 100644 --- a/ansible/roles/setup/tasks/main.yml +++ b/ansible/roles/setup/tasks/main.yml @@ -1,20 +1,5 @@ --- -- name: Create directory to contain rke configuration - file: - path: "/oas/control/local/rke" - state: directory - become: true - -- name: Generate rke cluster configuration file - include_role: - role: rke_configuration - vars: - rke_configuration_location: "/oas/control/local/rke/cluster.yml" - rke_ssh_key_path: "/oas/config/ssh_key" - rke_ssh_agent_auth: "false" - become: true - - name: Create /oas/config/ssh_known_hosts lineinfile: dest: /oas/config/ssh_known_hosts