summaryrefslogtreecommitdiffstats
path: root/xci
diff options
context:
space:
mode:
Diffstat (limited to 'xci')
-rw-r--r--xci/installer/kubespray/playbooks/configure-kubenet.yml4
-rw-r--r--xci/opnfv-scenario-requirements.yml16
2 files changed, 18 insertions, 2 deletions
diff --git a/xci/installer/kubespray/playbooks/configure-kubenet.yml b/xci/installer/kubespray/playbooks/configure-kubenet.yml
index 3b1cb013..18a126c1 100644
--- a/xci/installer/kubespray/playbooks/configure-kubenet.yml
+++ b/xci/installer/kubespray/playbooks/configure-kubenet.yml
@@ -38,14 +38,14 @@
with_items: "{{ kubenet_xci_static_routes }}"
loop_control:
label: "{{ item.network }}"
- when: deploy_scenario == 'k8-nosdn-nofeature'
+ when: deploy_scenario.find('k8-nosdn-') != -1
- name: Ensure rp_filter is disabled on localhost
sysctl:
name: net.ipv4.conf.all.rp_filter
sysctl_set: yes
state: present
- value: "{{ deploy_scenario == 'k8-nosdn-nofeature' | ternary(0, 1) }}"
+ value: "{{ (kubenet_xci_static_routes is defined) | ternary(0, 1) }}"
reload: yes
delegate_to: localhost
run_once: True
diff --git a/xci/opnfv-scenario-requirements.yml b/xci/opnfv-scenario-requirements.yml
index 1c7c8d5b..f5fc62df 100644
--- a/xci/opnfv-scenario-requirements.yml
+++ b/xci/opnfv-scenario-requirements.yml
@@ -167,3 +167,19 @@
- ubuntu
- centos
- opensuse
+
+- scenario: k8-nosdn-istio
+ scm: git
+ src: https://gerrit.opnfv.org/gerrit/releng-xci-scenarios
+ version: master
+ role: scenarios/k8-nosdn-istio/role/k8-nosdn-istio
+ installers:
+ - installer: kubespray
+ flavors:
+ - ha
+ - mini
+ - noha
+ distros:
+ - ubuntu
+ - centos
+ - opensuse