diff options
| author |   Harry Huang <huangxiangyu5@huawei.com> | 2018-04-16 06:49:53 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-04-16 06:49:53 +0000 |
| commit | 1a1ce1f5fd93813ea60d0e49ddfe8e82cb8d9970 (patch) | |
| tree | d3705ae0cecb6c72fab750893a63f64a8200b39c /deploy/adapters/ansible/kubernetes/roles/install-k8s-dependence | |
| parent | 6852376b5af301781dbfb31a11903cf9ee95773e (diff) | |
| parent | 0f86f4504f82b5cd653edc8a8a4a27e16f36d0d4 (diff) | |
Merge "support deploying k8s above ubuntu on arm"
Diffstat (limited to 'deploy/adapters/ansible/kubernetes/roles/install-k8s-dependence')
| -rw-r--r-- | deploy/adapters/ansible/kubernetes/roles/install-k8s-dependence/tasks/main.yml | 2 | ||||
| -rw-r--r-- | deploy/adapters/ansible/kubernetes/roles/install-k8s-dependence/vars/Debian.yml | 13 |
2 files changed, 13 insertions, 2 deletions
diff --git a/deploy/adapters/ansible/kubernetes/roles/install-k8s-dependence/tasks/main.yml b/deploy/adapters/ansible/kubernetes/roles/install-k8s-dependence/tasks/main.yml index 4f8ca005..af234415 100644 --- a/deploy/adapters/ansible/kubernetes/roles/install-k8s-dependence/tasks/main.yml +++ b/deploy/adapters/ansible/kubernetes/roles/install-k8s-dependence/tasks/main.yml @@ -25,5 +25,5 @@ pkg: "{{ item }}" state: "present" update_cache: 'yes' - with_items: "{{ packages }}" + with_items: "{{ vars['packages_' + ansible_architecture] }}" when: ansible_os_family == 'Debian' diff --git a/deploy/adapters/ansible/kubernetes/roles/install-k8s-dependence/vars/Debian.yml b/deploy/adapters/ansible/kubernetes/roles/install-k8s-dependence/vars/Debian.yml index 0453dc44..6be9e06f 100644 --- a/deploy/adapters/ansible/kubernetes/roles/install-k8s-dependence/vars/Debian.yml +++ b/deploy/adapters/ansible/kubernetes/roles/install-k8s-dependence/vars/Debian.yml @@ -1,5 +1,5 @@ --- -packages: +packages_x86_64: - ubuntu-cloud-keyring - python-dev - python-pip @@ -11,6 +11,17 @@ packages: - python-crypto - git +packages_aarch64: + - ubuntu-cloud-keyring + - python-dev + - python-pip + - openvswitch-switch + - python-memcache + - python-iniparse + - python-lxml + - python-crypto + - git + pip_packages: - crudini - python-keyczar |