diff options
Diffstat (limited to 'xci/installer')
3 files changed, 22 insertions, 2 deletions
diff --git a/xci/installer/osh/playbooks/install-openstack-helm.yml b/xci/installer/osh/playbooks/install-openstack-helm.yml index 10d8d6d4..a16572a5 100644 --- a/xci/installer/osh/playbooks/install-openstack-helm.yml +++ b/xci/installer/osh/playbooks/install-openstack-helm.yml @@ -11,11 +11,14 @@ remote_user: root vars_files: - "{{ xci_path }}/xci/var/opnfv.yml" - roles: - role: prepare-opnfvhost-osh - role: prepare-osh - role: install-osh-mini when: xci_flavor == 'mini' + environment: + - CONTAINER_DISTRO_NAME: "{{ container_distro_name }}" + - CONTAINER_DISTRO_VERSION: "{{ container_distro_version }}" + - OPENSTACK_RELEASE: "{{ openstack_osh_version }}" - role: install-osh-noha when: xci_flavor == 'noha' 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 - |