diff options
| -rw-r--r-- | INFO.yaml | 2 | ||||
| -rw-r--r-- | xci/installer/osh/playbooks/roles/install-osh-mini/tasks/main.yml | 15 | ||||
| -rw-r--r-- | xci/installer/osh/playbooks/roles/install-osh-mini/vars/main.yml | 18 |
3 files changed, 19 insertions, 16 deletions
@@ -38,5 +38,5 @@ committers: - name: 'Manuel Buil' company: 'SUSE' email: 'mbuil@suse.com' - id: 'mbuild' + id: 'mbuil' timezone: 'Europe/Madrid' 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 eb920a8e..20a7c77e 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,19 +1,4 @@ --- -- 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 diff --git a/xci/installer/osh/playbooks/roles/install-osh-mini/vars/main.yml b/xci/installer/osh/playbooks/roles/install-osh-mini/vars/main.yml new file mode 100644 index 00000000..03c02a83 --- /dev/null +++ b/xci/installer/osh/playbooks/roles/install-osh-mini/vars/main.yml @@ -0,0 +1,18 @@ +--- +# Copyright 2019, SUSE Linux GmbH +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +cacheable: yes +container_distro_name: "{{ (osh_distro=='opensuse') | ternary('opensuse', 'ubuntu') }}" +container_distro_version: "{{ (osh_distro=='opensuse') | ternary('15', 'xenial') }}" |