Move variable definition to vars

Ansible best practices recommend doing the definition of variables in
the vars directory instead of directly in the tasks

deploy-scenario:k8-calico-nofeature
installer-type:osh

Change-Id: Ia5e215f8492a901b8c75ac06ee23258249f7f09a
Signed-off-by: Manuel Buil <mbuil@suse.com>

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 e3fa2dd..662f03d 100644 (file)
--- 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 (file)
index 0000000..03c02a8
--- /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') }}"