diff options
| author |   Tomáš Levora <t.levora@partner.samsung.com> | 2019-06-14 10:54:39 +0200 |
|---|---|---|
| committer | Tomáš Levora <t.levora@partner.samsung.com> | 2019-06-14 14:02:06 +0200 |
| commit | f6bd937571c8f88bcf506d11ef06243e7851f2cf (patch) | |
| tree | 338f69b9ecd0d27dd201d386cdc8b595cf08a2f9 /ansible | |
| parent | f2f06700b7b9ad99c9c182fc01ee5cc0782ead78 (diff) | |
Add binaries preparation to installation steps
Adding binaries preparation into installation steps as rke binary need
to be renamed and helm binary need to be unarchived. Removing those
previously manual steps from BuilGuide
Issue-ID: OOM-1925
Change-Id: I504320fb82e1c8f6db2f99c5dfd4518192eae895
Signed-off-by: Tomáš Levora <t.levora@partner.samsung.com>
Diffstat (limited to 'ansible')
| -rwxr-xr-x | ansible/group_vars/infrastructure.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/helm/tasks/main.yml | 8 | ||||
| -rw-r--r-- | ansible/roles/rke/defaults/main.yml | 2 | ||||
| -rw-r--r-- | ansible/test/roles/prepare-helm/tasks/main.yml | 14 | ||||
| -rw-r--r-- | ansible/test/roles/prepare-rke/tasks/infra.yml | 2 |
5 files changed, 13 insertions, 14 deletions
diff --git a/ansible/group_vars/infrastructure.yml b/ansible/group_vars/infrastructure.yml index 08a25919..a6e2d775 100755 --- a/ansible/group_vars/infrastructure.yml +++ b/ansible/group_vars/infrastructure.yml @@ -28,6 +28,7 @@ all_simulated_hosts: "{{ simulated_hosts.git + simulated_hosts.http + simulated_hosts.nexus }}" populate_nexus: false helm_bin_dir: /usr/local/bin +helm_version: v2.12.3 rancher_server_image: rancher/server:v1.6.22 vnc_server_image: consol/ubuntu-icewm-vnc:1.4.0 nexus3_image: sonatype/nexus3:3.15.2 diff --git a/ansible/roles/helm/tasks/main.yml b/ansible/roles/helm/tasks/main.yml index 2521ad28..c1b47103 100644 --- a/ansible/roles/helm/tasks/main.yml +++ b/ansible/roles/helm/tasks/main.yml @@ -1,7 +1,11 @@ --- - name: Install Helm - copy: - src: "{{ app_data_path }}/downloads/helm" + unarchive: + src: "{{ app_data_path }}/downloads/helm-{{ helm_version }}-linux-amd64.tar.gz" dest: "{{ helm_bin_dir }}" + extra_opts: + - --strip=1 + - --wildcards + - '*/helm' remote_src: true mode: 0755 diff --git a/ansible/roles/rke/defaults/main.yml b/ansible/roles/rke/defaults/main.yml index 88216857..2f160fc2 100644 --- a/ansible/roles/rke/defaults/main.yml +++ b/ansible/roles/rke/defaults/main.yml @@ -1,5 +1,5 @@ --- -rke_binary: rke +rke_binary: rke_linux-amd64 rke_username: rke rke_bin_dir: /usr/local/bin kube_config_dir: "{{ ansible_env.HOME }}/.kube" diff --git a/ansible/test/roles/prepare-helm/tasks/main.yml b/ansible/test/roles/prepare-helm/tasks/main.yml index aa01e281..d6fabae9 100644 --- a/ansible/test/roles/prepare-helm/tasks/main.yml +++ b/ansible/test/roles/prepare-helm/tasks/main.yml @@ -5,14 +5,8 @@ recurse: true state: directory -- name: "Download and unarchive helm-{{ helm_version }}" - unarchive: - src: "https://get.helm.sh/helm-v{{ helm_version }}-linux-amd64.tar.gz" - dest: "/tmp" - remote_src: true - -- name: "Copy helm binary" - copy: - src: /tmp/linux-amd64/helm - dest: "{{ app_data_path }}/downloads/helm" +- name: "Download helm-{{ helm_version }}" + get_url: + url: "https://get.helm.sh/helm-v{{ helm_version }}-linux-amd64.tar.gz" + dest: "{{ app_data_path }}/downloads" remote_src: true diff --git a/ansible/test/roles/prepare-rke/tasks/infra.yml b/ansible/test/roles/prepare-rke/tasks/infra.yml index 55ab7f16..e9971f77 100644 --- a/ansible/test/roles/prepare-rke/tasks/infra.yml +++ b/ansible/test/roles/prepare-rke/tasks/infra.yml @@ -7,7 +7,7 @@ - name: "Install rke-{{ rke_version }}" get_url: url: "https://github.com/rancher/rke/releases/download/v{{ rke_version }}/rke_linux-amd64" - dest: "{{ app_data_path }}/downloads/rke" + dest: "{{ app_data_path }}/downloads/rke_linux-amd64" - name: "Install kubectl-{{ kubectl_version }}" get_url: |