[xci] integrate istio in XCI

using kubespary to deploy the istio, kubespary support to deploy istio

installer-type:kubespray
deploy-scenario:k8-nosdn-istio

Change-Id: Id8c04936187c89fafa921dada382a0e9e11aab27
Signed-off-by: wutianwei <wutianwei1@huawei.com>
Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>

diff --git a/xci/installer/kubespray/playbooks/configure-kubenet.yml b/xci/installer/kubespray/playbooks/configure-kubenet.yml
index 3b1cb01..18a126c 100644 (file)
--- 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 1c7c8d5..f5fc62d 100644 (file)
--- 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