From 574633e73605bfa58872c1e00a82febe7f7f8101 Mon Sep 17 00:00:00 2001 From: Ritu Sood Date: Tue, 9 Apr 2019 11:29:59 -0700 Subject: Remove andrewrothstein.kubectl role Removing andrewrothstein.kubectl role which was causing issues in aio baremetal scenario Change-Id: If3c8c71319c4b14dedfa5997881307e5424fd453 Signed-off-by: Ritu Sood Issue-ID: MULTICLOUD-301 --- kud/deployment_infra/galaxy-requirements.yml | 2 -- kud/deployment_infra/playbooks/configure-istio.yml | 2 -- kud/deployment_infra/playbooks/configure-multus.yml | 3 --- kud/deployment_infra/playbooks/configure-nfd.yml | 3 --- kud/deployment_infra/playbooks/configure-virtlet.yml | 2 -- kud/deployment_infra/playbooks/kud-vars.yml | 1 - 6 files changed, 13 deletions(-) (limited to 'kud/deployment_infra') diff --git a/kud/deployment_infra/galaxy-requirements.yml b/kud/deployment_infra/galaxy-requirements.yml index 5d232451..093dec87 100644 --- a/kud/deployment_infra/galaxy-requirements.yml +++ b/kud/deployment_infra/galaxy-requirements.yml @@ -9,8 +9,6 @@ ############################################################################## - src: andrewrothstein.go version: v2.1.10 -- src: andrewrothstein.kubectl - version: v1.1.18 - src: andrewrothstein.kubernetes-helm version: v1.2.9 - src: geerlingguy.docker diff --git a/kud/deployment_infra/playbooks/configure-istio.yml b/kud/deployment_infra/playbooks/configure-istio.yml index 72542e5a..3a1ca8ed 100644 --- a/kud/deployment_infra/playbooks/configure-istio.yml +++ b/kud/deployment_infra/playbooks/configure-istio.yml @@ -14,8 +14,6 @@ include_vars: file: kud-vars.yml roles: - - role: andrewrothstein.kubectl - kubectl_ver: "v{{ kubectl_version }}" - role: andrewrothstein.kubernetes-helm kubernetes_helm_ver: "v{{ helm_client_version }}" tasks: diff --git a/kud/deployment_infra/playbooks/configure-multus.yml b/kud/deployment_infra/playbooks/configure-multus.yml index 91da8746..9cca54d1 100644 --- a/kud/deployment_infra/playbooks/configure-multus.yml +++ b/kud/deployment_infra/playbooks/configure-multus.yml @@ -89,9 +89,6 @@ - name: Load kud variables include_vars: file: kud-vars.yml - roles: - - role: andrewrothstein.kubectl - kubectl_ver: "v{{ kubectl_version }}" tasks: - name: define a CRD network object specification blockinfile: diff --git a/kud/deployment_infra/playbooks/configure-nfd.yml b/kud/deployment_infra/playbooks/configure-nfd.yml index a091d04b..590212cf 100644 --- a/kud/deployment_infra/playbooks/configure-nfd.yml +++ b/kud/deployment_infra/playbooks/configure-nfd.yml @@ -50,9 +50,6 @@ - name: Load kud variables include_vars: file: kud-vars.yml - roles: - - role: andrewrothstein.kubectl - kubectl_ver: "v{{ kubectl_version }}" tasks: - name: create service accounts command: "/usr/local/bin/kubectl apply -f /tmp/{{ item }}" diff --git a/kud/deployment_infra/playbooks/configure-virtlet.yml b/kud/deployment_infra/playbooks/configure-virtlet.yml index aba849a4..18d3740a 100644 --- a/kud/deployment_infra/playbooks/configure-virtlet.yml +++ b/kud/deployment_infra/playbooks/configure-virtlet.yml @@ -15,8 +15,6 @@ include_vars: file: kud-vars.yml roles: - - role: andrewrothstein.kubectl - kubectl_ver: "v{{ kubectl_version }}" - role: geerlingguy.docker when: virtlet_source_type == "source" tasks: diff --git a/kud/deployment_infra/playbooks/kud-vars.yml b/kud/deployment_infra/playbooks/kud-vars.yml index d7ada47e..b11672f3 100644 --- a/kud/deployment_infra/playbooks/kud-vars.yml +++ b/kud/deployment_infra/playbooks/kud-vars.yml @@ -59,7 +59,6 @@ ovn4nfv_url: "https://git.opnfv.org/ovn4nfv-k8s-plugin/" go_version: '1.12.4' kubespray_version: 2.8.2 -kubectl_version: 1.12.2 helm_client_version: 2.9.1 # kud playbooks not compatible with 2.8.0 - see MULTICLOUD-634 ansible_version: 2.7.10 -- cgit 1.2.3-korg