From 02cb076db485fde5500093d35abbf31d0d038978 Mon Sep 17 00:00:00 2001 From: Nikos Mimigiannis Date: Thu, 18 Jul 2019 12:01:51 +0300 Subject: Support of opensuse in OSH-XCI deploy-scenario:k8-calico-nofeature installer-type:osh Change-Id: Ie198ee7e25579f1438561f71fd965518b067fe42 Signed-off-by: Nikos Mimigiannis --- .../osh/playbooks/roles/install-osh-mini/tasks/main.yml | 17 +++++++++++++++++ .../playbooks/roles/prepare-opnfvhost-osh/vars/main.yml | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) (limited to 'xci/installer/osh/playbooks/roles') diff --git a/xci/installer/osh/playbooks/roles/install-osh-mini/tasks/main.yml b/xci/installer/osh/playbooks/roles/install-osh-mini/tasks/main.yml index c9d23dd1..e3fa2ddf 100644 --- a/xci/installer/osh/playbooks/roles/install-osh-mini/tasks/main.yml +++ b/xci/installer/osh/playbooks/roles/install-osh-mini/tasks/main.yml @@ -1,3 +1,20 @@ +--- +- set_fact: + container_distro_name: "opensuse" + container_distro_version: "15" + cacheable: yes + when: osh_distro == 'opensuse' + tags: + - skip_ansible_lint + +- set_fact: + container_distro_name: "ubuntu" + container_distro_version: "xenial" + cacheable: yes + when: osh_distro == 'ubuntu' + tags: + - skip_ansible_lint + - name: Setup Clients command: ./tools/deployment/common/setup-client.sh changed_when: false diff --git a/xci/installer/osh/playbooks/roles/prepare-opnfvhost-osh/vars/main.yml b/xci/installer/osh/playbooks/roles/prepare-opnfvhost-osh/vars/main.yml index d42392ef..53188bdb 100644 --- a/xci/installer/osh/playbooks/roles/prepare-opnfvhost-osh/vars/main.yml +++ b/xci/installer/osh/playbooks/roles/prepare-opnfvhost-osh/vars/main.yml @@ -1,7 +1,7 @@ +--- required_packages: - patch - ipcalc - jq - nmap - bc - -- cgit 1.2.3-korg