diff options
| author |   Samuli Silvius <s.silvius@partner.samsung.com> | 2019-06-26 10:46:26 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-06-26 10:46:26 +0000 |
| commit | 9591bbf978d8e738143f4a94b6df7045e4074f78 (patch) | |
| tree | 93842191cfbb0487072026f348aab8f49492efdb /ansible/roles | |
| parent | 1dd72bddf480e3af3b82ce7863d9397dc9c71003 (diff) | |
| parent | 61d7bfee9cf357ee4846ea2839d2be9aab2aa253 (diff) | |
Merge changes from topic "bin_utils"
* changes:
Fix tests for binaries preparation in installation steps
Add binaries preparation to installation steps
Diffstat (limited to 'ansible/roles')
| l--------- | ansible/roles/helm/molecule/default/group_vars/infrastructure.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/helm/molecule/default/prepare.yml | 5 | ||||
| -rw-r--r-- | ansible/roles/helm/tasks/main.yml | 8 | ||||
| -rw-r--r-- | ansible/roles/rke/defaults/main.yml | 2 |
4 files changed, 12 insertions, 4 deletions
diff --git a/ansible/roles/helm/molecule/default/group_vars/infrastructure.yml b/ansible/roles/helm/molecule/default/group_vars/infrastructure.yml new file mode 120000 index 00000000..3e9c2f0c --- /dev/null +++ b/ansible/roles/helm/molecule/default/group_vars/infrastructure.yml @@ -0,0 +1 @@ +../../../../../group_vars/infrastructure.yml
\ No newline at end of file diff --git a/ansible/roles/helm/molecule/default/prepare.yml b/ansible/roles/helm/molecule/default/prepare.yml index 8a149b89..34c41e8e 100644 --- a/ansible/roles/helm/molecule/default/prepare.yml +++ b/ansible/roles/helm/molecule/default/prepare.yml @@ -1,5 +1,8 @@ --- - name: Prepare for helm tests - hosts: all + hosts: infrastructure + pre_tasks: + - name: Include infrastructure group variables + include_vars: ../../../../group_vars/infrastructure.yml roles: - prepare-helm 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" |