diff options
| author |   wutianwei <wutianwei1@huawei.com> | 2018-06-13 11:53:14 +0800 |
|---|---|---|
| committer |   Fatih Degirmenci <fdegir@gmail.com> | 2018-08-23 10:52:26 +0000 |
| commit | e17c762bd13cab40a1a741ee3a9ac63db5612e4f (patch) | |
| tree | cf97182e4b813e1d0678aee96efafb7375e7c741 | |
| parent | e1b1f28d3ad3224e518faa50a04e04bde51c4829 (diff) | |
[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>
| -rw-r--r-- | xci/installer/kubespray/playbooks/configure-kubenet.yml | 4 | ||||
| -rw-r--r-- | xci/opnfv-scenario-requirements.yml | 16 |
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 |