9 files changed, 34 insertions, 17 deletions
diff --git a/xci/installer/osh/playbooks/group_vars/all b/xci/installer/osh/playbooks/group_vars/all.yml
index 328f8dba..7453bdab 100644
--- a/xci/installer/osh/playbooks/group_vars/all
+++ b/xci/installer/osh/playbooks/group_vars/all.yml
@@ -1,3 +1,4 @@
+---
 keepalived_ubuntu_src: "uca"
 keepalived_uca_apt_repo_url: "{{ uca_apt_repo_url | default('http://ubuntu-cloud.archive.canonical.com/ubuntu') }}"
 
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 e3fa2ddf..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
@@ -96,7 +81,7 @@
     chdir: /root/repos/openstack-helm
 
 - name: Copy script to the worker node
-  command: "scp -o \"StrictHostKeyChecking no\" tools/deployment/developer/ceph/170-setup-gateway.sh root@192.168.122.4:170-setup-gateway.sh"
+  command: "scp -o \"StrictHostKeyChecking no\" tools/deployment/developer/ceph/170-setup-gateway.sh root@{{ hostvars.node1.ip }}:170-setup-gateway.sh"
   changed_when: false
   args:
     chdir: /root/repos/openstack-helm
@@ -104,7 +89,7 @@
 - name: Setup the gateway to the public network at worker node
   command: /root/170-setup-gateway.sh
   changed_when: false
-  delegate_to: 192.168.122.4
+  delegate_to: node1
 
 - name: Add a route from opnfv to worker node for the public network
   command: ip route add 172.24.4.0/24 via 192.168.122.4
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') }}"
diff --git a/xci/installer/osh/playbooks/roles/install-osh-noha/tasks/main.yml b/xci/installer/osh/playbooks/roles/install-osh-noha/tasks/main.yml
index 231572c9..9e783cb7 100644
--- a/xci/installer/osh/playbooks/roles/install-osh-noha/tasks/main.yml
+++ b/xci/installer/osh/playbooks/roles/install-osh-noha/tasks/main.yml
@@ -1,3 +1,4 @@
+---
 - name: Setup Clients
   command: ./tools/deployment/multinode/010-setup-client.sh
   changed_when: false
diff --git a/xci/installer/osh/playbooks/roles/prepare-kube-nodes-osh/tasks/main.yml b/xci/installer/osh/playbooks/roles/prepare-kube-nodes-osh/tasks/main.yml
index 5a70f971..ff0aff60 100644
--- a/xci/installer/osh/playbooks/roles/prepare-kube-nodes-osh/tasks/main.yml
+++ b/xci/installer/osh/playbooks/roles/prepare-kube-nodes-osh/tasks/main.yml
@@ -1,3 +1,4 @@
+---
 - name: Install packages in kubernetes nodes
   package:
     name: "{{ packages }}"
diff --git a/xci/installer/osh/playbooks/roles/prepare-opnfvhost-osh/tasks/main.yml b/xci/installer/osh/playbooks/roles/prepare-opnfvhost-osh/tasks/main.yml
index 7e2a52ab..b31dc706 100644
--- a/xci/installer/osh/playbooks/roles/prepare-opnfvhost-osh/tasks/main.yml
+++ b/xci/installer/osh/playbooks/roles/prepare-opnfvhost-osh/tasks/main.yml
@@ -1,3 +1,4 @@
+---
 - name: Set kubernetes service account permissions
   command: "kubectl create clusterrolebinding add-on-cluster-admin --clusterrole=cluster-admin --serviceaccount=kube-system:default"
   changed_when: false
diff --git a/xci/installer/osh/playbooks/roles/prepare-osh/tasks/main.yml b/xci/installer/osh/playbooks/roles/prepare-osh/tasks/main.yml
index d9718ea4..aeaca6be 100644
--- a/xci/installer/osh/playbooks/roles/prepare-osh/tasks/main.yml
+++ b/xci/installer/osh/playbooks/roles/prepare-osh/tasks/main.yml
@@ -1,3 +1,4 @@
+---
 - name: Write new resolv.conf file
   template:
     src: resolv.conf.j2
diff --git a/xci/installer/osh/playbooks/roles/prepare-osh/vars/main.yml b/xci/installer/osh/playbooks/roles/prepare-osh/vars/main.yml
index abb0d6eb..4d6f9cbb 100644
--- a/xci/installer/osh/playbooks/roles/prepare-osh/vars/main.yml
+++ b/xci/installer/osh/playbooks/roles/prepare-osh/vars/main.yml
@@ -1,3 +1,4 @@
+---
 kube_dns_ip: "10.233.0.3"
 external_dns_nameservers:
 - '{{kube_dns_ip}}'
diff --git a/xci/opnfv-scenario-requirements.yml b/xci/opnfv-scenario-requirements.yml
index f509494f..98abf528 100644
--- a/xci/opnfv-scenario-requirements.yml
+++ b/xci/opnfv-scenario-requirements.yml
@@ -28,6 +28,14 @@
         - opensuse
         - ubuntu
         - centos
+    - installer: osh
+      flavors:
+        - mini
+        - noha
+      distros:
+        - ubuntu
+        - opensuse
+        - ubuntu-bionic
 
 - scenario: os-nosdn-osm
   scm: git