diff options
| -rw-r--r-- | xci/installer/kubespray/playbooks/configure-kubenet.yml | 4 | ||||
| -rwxr-xr-x | xci/installer/osa/deploy.sh | 31 | ||||
| -rw-r--r-- | xci/opnfv-scenario-requirements.yml | 16 |
3 files changed, 34 insertions, 17 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/installer/osa/deploy.sh b/xci/installer/osa/deploy.sh index fd794d01..8b3a67d0 100755 --- a/xci/installer/osa/deploy.sh +++ b/xci/installer/osa/deploy.sh @@ -160,6 +160,22 @@ echo echo "Info: OpenStack installation is successfully completed!" #------------------------------------------------------------------------------- +# Execute post-installation tasks +#------------------------------------------------------------------------------- +# Playbook post.yml is used in order to execute any post-deployment tasks that +# are required for the scenario under test. +#------------------------------------------------------------------------------- +echo "-----------------------------------------------------------------------" +echo "Info: Running post-deployment scenario role" +echo "-----------------------------------------------------------------------" +cd $OSA_XCI_PLAYBOOKS +ansible-playbook ${XCI_ANSIBLE_PARAMS} -i ${XCI_PLAYBOOKS}/dynamic_inventory.py \ + post-deployment.yml +echo "-----------------------------------------------------------------------" +echo +echo "Info: Post-deployment scenario role execution done" + +#------------------------------------------------------------------------------- # - Getting OpenStack login information #------------------------------------------------------------------------------- echo "Info: Openstack login details" @@ -180,19 +196,4 @@ echo "Info: Admin username - ${USERNAME##*=}" echo "Info: Admin password - ${PASSWORD##*=}" echo "Info: It is recommended to change the default password." -#------------------------------------------------------------------------------- -# Execute post-installation tasks -#------------------------------------------------------------------------------- -# Playbook post.yml is used in order to execute any post-deployment tasks that -# are required for the scenario under test. -#------------------------------------------------------------------------------- -echo "-----------------------------------------------------------------------" -echo "Info: Running post-deployment scenario role" -echo "-----------------------------------------------------------------------" -cd $OSA_XCI_PLAYBOOKS -ansible-playbook ${XCI_ANSIBLE_PARAMS} -i ${XCI_PLAYBOOKS}/dynamic_inventory.py \ - post-deployment.yml -echo "-----------------------------------------------------------------------" -echo -echo "Info: Post-deployment scenario role execution done" # vim: set ts=4 sw=4 expandtab: 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 |