From: Yifei Xue <xueyifei@huawei.com>
Date: Thu, 23 Nov 2017 08:52:43 +0000 (+0000)
Subject: Merge "Support the scenario for installing kubernetes in ubuntu system"
X-Git-Tag: opnfv-6.0.0~86
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=9a76ddb1075479c891389a0c9303d80ead9895a0;p=compass4nfv.git

Merge "Support the scenario for installing kubernetes in ubuntu system"
---

9a76ddb1075479c891389a0c9303d80ead9895a0
diff --cc deploy/adapters/ansible/kubernetes/roles/kargo/tasks/main.yml
index a40778f5,6d6720ba..4df8dffa
--- a/deploy/adapters/ansible/kubernetes/roles/kargo/tasks/main.yml
+++ b/deploy/adapters/ansible/kubernetes/roles/kargo/tasks/main.yml
@@@ -21,12 -23,10 +23,13 @@@
  
  - name: configure local mirror repo
    copy:
 -    src: mirrors.repo
 +    src: "{{ item }}"
      dest: /etc/yum.repos.d/mirrors.repo
 +  with_first_found:
 +    - mirrors_{{ ansible_architecture }}.repo
 +    - mirrors.repo
    run_once: "True"
+   when: ansible_os_family == 'RedHat'
  
  - name: clean local pip conf to use official pip repo
    file: