diff options
| author |   Konrad Bańka <k.banka@samsung.com> | 2019-07-02 08:43:11 +0200 |
|---|---|---|
| committer | Konrad Bańka <k.banka@samsung.com> | 2019-07-09 16:05:23 +0200 |
| commit | 7ff99668b98aae1210f72e84fcc1305814563600 (patch) | |
| tree | c06ab9617e158076e2677aa17c755ac7af000dd9 /kud/deployment_infra | |
| parent | 8445148cf095fcc55a9ada3e2bb0fece7a065089 (diff) | |
Fix helm installation conflict
Kubespray installs helm client on kubernetes master. The same client
has to be installed on host running installation playbooks. In single
node scenario, local host already has helm client installed by
kubespray, thus leading to conflict due to way of provisioning.
This helm installation has been moved to global configure playbook, as
well as corrected, not to fail on single host deployments.
Issue-ID: MULTICLOUD-690
Signed-off-by: Konrad Bańka <k.banka@samsung.com>
Change-Id: I1ef779ed0f2fde82758ce9e229c3f5bb015b2aeb
Diffstat (limited to 'kud/deployment_infra')
| -rw-r--r-- | kud/deployment_infra/playbooks/configure-istio.yml | 6 | ||||
| -rw-r--r-- | kud/deployment_infra/playbooks/configure-kud.yml | 17 |
2 files changed, 18 insertions, 5 deletions
diff --git a/kud/deployment_infra/playbooks/configure-istio.yml b/kud/deployment_infra/playbooks/configure-istio.yml index 3a1ca8ed..f975e309 100644 --- a/kud/deployment_infra/playbooks/configure-istio.yml +++ b/kud/deployment_infra/playbooks/configure-istio.yml @@ -9,14 +9,10 @@ ############################################################################## - hosts: localhost - pre_tasks: + tasks: - name: Load kud variables include_vars: file: kud-vars.yml - roles: - - role: andrewrothstein.kubernetes-helm - kubernetes_helm_ver: "v{{ helm_client_version }}" - tasks: - name: create istio folder file: state: directory diff --git a/kud/deployment_infra/playbooks/configure-kud.yml b/kud/deployment_infra/playbooks/configure-kud.yml index 9dcf6f39..0e32e69d 100644 --- a/kud/deployment_infra/playbooks/configure-kud.yml +++ b/kud/deployment_infra/playbooks/configure-kud.yml @@ -7,6 +7,23 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## +- hosts: localhost + pre_tasks: + - name: Load kud variables + include_vars: + file: kud-vars.yml + - name: Check if helm client is already installed #It is in single node deployment + command: helm version -c + register: helm_client + failed_when: False + changed_when: False + check_mode: False + roles: + - name: andrewrothstein.kubernetes-helm + when: helm_client.rc != 0 + vars: + kubernetes_helm_ver: "v{{ helm_client_version }}" + - hosts: kube-node become: yes tasks: |