diff options
31 files changed, 208 insertions, 111 deletions
diff --git a/docs/images/arch-layout-k8s-ha.png b/docs/images/arch-layout-k8s-ha.png Binary files differnew file mode 100644 index 00000000..e0870305 --- /dev/null +++ b/docs/images/arch-layout-k8s-ha.png diff --git a/docs/images/arch-layout-k8s-noha.png b/docs/images/arch-layout-k8s-noha.png Binary files differnew file mode 100644 index 00000000..0ee8bceb --- /dev/null +++ b/docs/images/arch-layout-k8s-noha.png diff --git a/docs/xci-user-guide.rst b/docs/xci-user-guide.rst index 7a411257..8f506fc4 100644 --- a/docs/xci-user-guide.rst +++ b/docs/xci-user-guide.rst @@ -41,6 +41,7 @@ The sandbox provides * multiple OPNFV scenarios to install * ability to select different versions of upstream components to base the work on * ability to enable additional OpenStack services or disable others +* ability to install kubernetes with different network plugins One last point to highlight here is that the XCI itself uses the sandbox for development and test purposes so it is continuously tested to ensure it works @@ -50,10 +51,11 @@ purposes. Components of the Sandbox =================================== -The sandbox uses OpenStack projects for VM node creation, provisioning -and OpenStack installation. XCI Team provides playbooks, roles, and scripts -to ensure the components utilized by the sandbox work in a way that serves -the users in the best possible way. +The sandbox uses OpenStack tools for VM node creation and provisioning. +OpenStack and Kubernetes installations are done using the tools from corresponding +upstream projects with no changes to them. XCI Team provides playbooks, +roles, and scripts to ensure the components utilized by the sandbox +work in a way that serves the users in the best possible way. * **openstack/bifrost:** Bifrost (pronounced bye-frost) is a set of Ansible playbooks that automates the task of deploying a base image onto a set @@ -70,6 +72,13 @@ the users in the best possible way. More information about this project can be seen on `OpenStack Ansible documentation <https://docs.openstack.org/developer/openstack-ansible/>`_. +* **kubernetes-incubator/kubespray:** Kubespray is a composition of Ansible playbooks, + inventory, provisioning tools, and domain knowledge for generic Kubernetes + clusters configuration management tasks. The aim of kubespray is deploying a + production ready Kubernetes cluster. + More information about this project can be seen on + `Kubespray documentation <https://kubernetes.io/docs/getting-started-guides/kubespray/>`_. + * **opnfv/releng-xci:** OPNFV Releng Project provides additional scripts, Ansible playbooks and configuration options in order for developers to have an easy way of using openstack/bifrost and openstack/openstack-ansible by just @@ -85,29 +94,29 @@ deployed using VM nodes. Available flavors are listed on the table below. -+------------------+------------------------+---------------------+-------------------------+ -| Flavor | Number of VM Nodes | VM Specs Per Node | Time Estimates | -+==================+========================+=====================+=========================+ -| All in One (aio) | | 1 VM Node | | vCPUs: 8 | | Provisioning: 10 mins | -| | | controller & compute | | RAM: 12GB | | Deployment: 90 mins | -| | | on single/same node | | Disk: 80GB | | Total: 100 mins | -| | | 1 compute node | | NICs: 1 | | | -+------------------+------------------------+---------------------+-------------------------+ -| Mini | | 3 VM Nodes | | vCPUs: 6 | | Provisioning: 12 mins | -| | | 1 deployment node | | RAM: 12GB | | Deployment: 65 mins | -| | | 1 controller node | | Disk: 80GB | | Total: 77 mins | -| | | 1 compute node | | NICs: 1 | | | -+------------------+------------------------+---------------------+-------------------------+ -| No HA | | 4 VM Nodes | | vCPUs: 6 | | Provisioning: 12 mins | -| | | 1 deployment node | | RAM: 12GB | | Deployment: 70 mins | -| | | 1 controller node | | Disk: 80GB | | Total: 82 mins | -| | | 2 compute nodes | | NICs: 1 | | | -+------------------+------------------------+---------------------+-------------------------+ -| HA | | 6 VM Nodes | | vCPUs: 6 | | Provisioning: 15 mins | -| | | 1 deployment node | | RAM: 12GB | | Deployment: 105 mins | -| | | 3 controller nodes | | Disk: 80GB | | Total: 120 mins | -| | | 2 compute nodes | | NICs: 1 | | | -+------------------+------------------------+---------------------+-------------------------+ ++------------------+------------------------+---------------------+--------------------------+--------------------------+ +| Flavor | Number of VM Nodes | VM Specs Per Node | Time Estimates Openstack | Time Estimates Kubernetes| ++==================+========================+=====================+==========================+==========================+ +| All in One (aio) | | 1 VM Node | | vCPUs: 8 | | Provisioning: 10 mins | | Provisioning: 10 mins | +| | | controller & compute | | RAM: 12GB | | Deployment: 90 mins | | Deployment: 30 mins | +| | | on single/same node | | Disk: 80GB | | Total: 100 mins | | Total: 40 mins | +| | | 1 compute node | | NICs: 1 | | | | | ++------------------+------------------------+---------------------+--------------------------+--------------------------+ +| Mini | | 3 VM Nodes | | vCPUs: 6 | | Provisioning: 12 mins | | Provisioning: 12 mins | +| | | 1 deployment node | | RAM: 12GB | | Deployment: 65 mins | | Deployment: 35 mins | +| | | 1 controller node | | Disk: 80GB | | Total: 77 mins | | Total: 47 mins | +| | | 1 compute node | | NICs: 1 | | | | | ++------------------+------------------------+---------------------+--------------------------+--------------------------+ +| No HA | | 4 VM Nodes | | vCPUs: 6 | | Provisioning: 12 mins | | Provisioning: 12 mins | +| | | 1 deployment node | | RAM: 12GB | | Deployment: 70 mins | | Deployment: 35 mins | +| | | 1 controller node | | Disk: 80GB | | Total: 82 mins | | Total: 47 mins | +| | | 2 compute nodes | | NICs: 1 | | | | | ++------------------+------------------------+---------------------+--------------------------+--------------------------+ +| HA | | 6 VM Nodes | | vCPUs: 6 | | Provisioning: 15 mins | | Provisioning: 15 mins | +| | | 1 deployment node | | RAM: 12GB | | Deployment: 105 mins | | Deployment: 40 mins | +| | | 3 controller nodes | | Disk: 80GB | | Total: 120 mins | | Total: 55 mins | +| | | 2 compute nodes | | NICs: 1 | | | | | ++------------------+------------------------+---------------------+--------------------------+--------------------------+ The specs for VMs are configurable and the more vCPU/RAM the better. @@ -122,8 +131,8 @@ depending on * installed/activated OpenStack services * internet connection bandwidth -Flavor Layouts --------------- +Flavor Layouts - OpenStack Based Deployments +-------------------------------------------- All flavors are created and deployed based on the upstream OpenStack Ansible (OSA) guidelines. @@ -165,6 +174,44 @@ flavors. .. image:: images/arch-layout-test.png :scale: 75 % +Flavor Layouts - Kubernetes Based Deployments +--------------------------------------------- + +All flavors are created and deployed based on the upstream kubespray guidelines. + +For network plugins, calico is used. flannel, weaver, contive, canal and cilium +are supported currently + +The differences between the flavors are documented below. + +**All in One** + +As shown on the table in the previous section, this flavor consists of a single +node. All the kubernetes services run on the same node, which acts as master +and worker at the same time. + +**Mini/No HA/HA** + +These flavors consist of multiple nodes. + +* **opnfv**: This node is used for driving the installation towards target nodes + in order to ensure the deployment process is isolated from the physical host + and always done on a clean machine. +* **master**: provide the kubernetes cluster’s control plane. +* **node**: a worker machine in Kubernetes, previously known as a minion. + +HA flavor has 3 master nodes and a load balancer is set up as part of the deployment process. +The access to the Kubernetes cluster is done through the load balancer. + +Please see the diagrams below for the host and service layout for these +flavors. + +.. image:: images/arch-layout-k8s-noha.png + :scale: 75 % + +.. image:: images/arch-layout-k8s-ha.png + :scale: 75 % + User Guide ========== @@ -200,7 +247,12 @@ How to Use | ``cd releng-xci/xci`` -4. Execute the sandbox script +4. If you want to deploy Kubernetes based scenario, set the variables as below. Otherwise skip. + + | ``export INSTALLER_TYPE=kubespray`` + | ``export DEPLOY_SCENARIO=k8-nosdn-nofeature`` + +5. Execute the sandbox script | ``./xci-deploy.sh`` @@ -241,8 +293,14 @@ default. 5. Set the version to use for openstack-ansible + 1) if deploying OpenStack based scenario + | ``export OPENSTACK_OSA_VERSION=master`` + 2) if deploying Kubernetes based scenario + + | ``export KUBESPRAY_VERSION=master`` + 6. Set where the logs should be stored | ``export LOG_PATH=/home/jenkins/xcilogs`` @@ -256,7 +314,7 @@ behaviors, especially if it is changed to ``master``. If you are not sure about how good the version you intend to use is, it is advisable to use the pinned versions instead. -**Verifying the Basic Operation** +**Verifying the Openstack Basic Operation** You can verify the basic operation using the commands below. @@ -276,6 +334,23 @@ You can also access the Horizon UI by using the URL, username, and the password displayed on your console upon the completion of the deployment. +**Verifying the Kubernetes Basic Operation** + +You can verify the basic operation using the commands below. + +1. Login to opnfv host + + | ``ssh root@192.168.122.2`` + +2. Issue kubectl commands + + | ``kubectl get nodes`` + +You can also access the Kubernetes Dashboard UI by using the URL, +username, and the password displayed on your console upon the +completion of the deployment. + + **Debugging Tips** If ``xci-deploy.sh`` fails midway through and you happen to fix whatever @@ -295,11 +370,12 @@ Here are steps that take place upon the execution of the sandbox script 2. Installs ansible on the host where sandbox script is executed. 3. Creates and provisions VM nodes based on the flavor chosen by the user. 4. Configures the host where the sandbox script is executed. -5. Configures the deployment host which the OpenStack installation will - be driven from. -6. Configures the target hosts where OpenStack will be installed. -7. Configures the target hosts as controller(s) and compute(s) nodes. -8. Starts the OpenStack installation. +5. Configures the deployment host which the OpenStack/Kubernetes + installation will be driven from. +6. Configures the target hosts where OpenStack/Kubernetes will be installed. +7. Configures the target hosts as controller(s)/compute(s) or master(s)/worker(s) + depending on the deployed scenario. +8. Starts the OpenStack/Kubernetes installation. .. image:: images/xci-basic-flow.png :height: 640px diff --git a/xci/config/env-vars b/xci/config/env-vars index 914224ca..f72a0240 100755 --- a/xci/config/env-vars +++ b/xci/config/env-vars @@ -36,7 +36,7 @@ export LOG_PATH=${LOG_PATH:-${XCI_PATH}/xci/logs} # This currently matches to OSA Ansible version but it doesn't really # matter since bifrost and OSA will use the Ansible version they need. # Overall, it's better to use what OSA supports so we can use new features. -export XCI_ANSIBLE_PIP_VERSION=2.3.2.0 +export XCI_ANSIBLE_PIP_VERSION=${XCI_ANSIBLE_PIP_VERSION:-$(curl -s https://raw.githubusercontent.com/openstack/openstack-ansible/${OPENSTACK_OSA_VERSION}/scripts/bootstrap-ansible.sh | grep ansible== | sed -n "s/.*ansible==\([0-9.]*\).*/\1/p")} export ANSIBLE_HOST_KEY_CHECKING=False # subject of the certificate export XCI_SSL_SUBJECT=${XCI_SSL_SUBJECT:-"/C=US/ST=California/L=San Francisco/O=IT/CN=xci.releng.opnfv.org"} diff --git a/xci/installer/osa/deploy.sh b/xci/installer/osa/deploy.sh index 6702b678..ce44626a 100755 --- a/xci/installer/osa/deploy.sh +++ b/xci/installer/osa/deploy.sh @@ -127,11 +127,6 @@ ssh root@$OPNFV_HOST_IP "set -o pipefail; openstack-ansible ${XCI_ANSIBLE_PARAMS releng-xci/.cache/repos/openstack-ansible/playbooks/setup-infrastructure.yml | tee setup-infrastructure.log" scp root@$OPNFV_HOST_IP:~/setup-infrastructure.log $LOG_PATH/setup-infrastructure.log echo "-----------------------------------------------------------------------" -# check the log to see if we have any error -if grep -q 'failed=1\|unreachable=1' $LOG_PATH/setup-infrastructure.log; then - echo "Error: OpenStack node setup failed!" - exit 1 -fi #------------------------------------------------------------------------------- # Verify database cluster @@ -161,11 +156,7 @@ ssh root@$OPNFV_HOST_IP "set -o pipefail; openstack-ansible ${XCI_ANSIBLE_PARAMS releng-xci/.cache/repos/openstack-ansible/playbooks/setup-openstack.yml | tee opnfv-setup-openstack.log" scp root@$OPNFV_HOST_IP:~/opnfv-setup-openstack.log $LOG_PATH/opnfv-setup-openstack.log echo "-----------------------------------------------------------------------" -# check the log to see if we have any error -if grep -q 'failed=1\|unreachable=1' $LOG_PATH/opnfv-setup-openstack.log; then - echo "Error: OpenStack installation failed!" - exit 1 -fi +echo echo "Info: OpenStack installation is successfully completed!" #------------------------------------------------------------------------------- diff --git a/xci/installer/osa/files/aio/inventory b/xci/installer/osa/files/aio/inventory index 9a3dd9ee..fa2a1009 100644 --- a/xci/installer/osa/files/aio/inventory +++ b/xci/installer/osa/files/aio/inventory @@ -1,2 +1,2 @@ -[opnfv] +[deployment] opnfv ansible_ssh_host=192.168.122.2 diff --git a/xci/installer/osa/files/ha/inventory b/xci/installer/osa/files/ha/inventory index 94b1d074..f5d882ef 100644 --- a/xci/installer/osa/files/ha/inventory +++ b/xci/installer/osa/files/ha/inventory @@ -1,4 +1,4 @@ -[opnfv] +[deployment] opnfv ansible_ssh_host=192.168.122.2 [controller] @@ -9,3 +9,7 @@ controller02 ansible_ssh_host=192.168.122.5 [compute] compute00 ansible_ssh_host=192.168.122.6 compute01 ansible_ssh_host=192.168.122.7 + +[openstack:children] +controller +compute diff --git a/xci/installer/osa/files/mini/inventory b/xci/installer/osa/files/mini/inventory index eb73e5e3..4224131f 100644 --- a/xci/installer/osa/files/mini/inventory +++ b/xci/installer/osa/files/mini/inventory @@ -1,4 +1,4 @@ -[opnfv] +[deployment] opnfv ansible_ssh_host=192.168.122.2 [controller] @@ -6,3 +6,7 @@ controller00 ansible_ssh_host=192.168.122.3 [compute] compute00 ansible_ssh_host=192.168.122.4 + +[openstack:children] +controller +compute diff --git a/xci/installer/osa/files/noha/inventory b/xci/installer/osa/files/noha/inventory index b4f9f6d0..0e3b8d84 100644 --- a/xci/installer/osa/files/noha/inventory +++ b/xci/installer/osa/files/noha/inventory @@ -1,4 +1,4 @@ -[opnfv] +[deployment] opnfv ansible_ssh_host=192.168.122.2 [controller] @@ -7,3 +7,7 @@ controller00 ansible_ssh_host=192.168.122.3 [compute] compute00 ansible_ssh_host=192.168.122.4 compute01 ansible_ssh_host=192.168.122.5 + +[openstack:children] +controller +compute diff --git a/xci/installer/osa/playbooks/configure-opnfvhost.yml b/xci/installer/osa/playbooks/configure-opnfvhost.yml index a3b8894f..4c30f4d1 100644 --- a/xci/installer/osa/playbooks/configure-opnfvhost.yml +++ b/xci/installer/osa/playbooks/configure-opnfvhost.yml @@ -27,10 +27,8 @@ remote_xci_playbooks: "{{ ansible_env.HOME }}/releng-xci/xci/playbooks" roles: - - role: configure-network - when: XCI_FLAVOR != "aio" - # we need to force sync time with ntp or the nodes will be out of sync timewise - - role: synchronize-time + - role: bootstrap-host + configure_network: XCI_FLAVOR != 'aio' tasks: - name: generate SSH keys @@ -77,12 +75,6 @@ - name: copy user_variables_ceph.yml shell: "/bin/cp -rf {{ remote_xci_flavor_files }}/user_variables_ceph.yml {{OPENSTACK_OSA_ETC_PATH}}/user_variables_ceph.yml" when: XCI_CEPH_ENABLED == "true" - # TODO: We need to get rid of this as soon as the issue is fixed upstream - - name: change the haproxy state from disable to enable - replace: - dest: "{{OPENSTACK_OSA_PATH}}/playbooks/os-keystone-install.yml" - regexp: '(\s+)haproxy_state: disabled' - replace: '\1haproxy_state: enabled' - name: copy OPNFV OpenStack playbook shell: "/bin/cp -rf {{ remote_xci_path }}/xci/installer/osa/files/setup-openstack.yml {{OPENSTACK_OSA_PATH}}/playbooks" - name: copy pinned versions of OSA Roles and global requirements @@ -138,6 +130,10 @@ content: "{{ xci_ssl_key }}" dest: "/etc/ssl/private/xci.key" become: true + - name: fetch xci environment + copy: + src: "{{ XCI_PATH }}/.cache/xci.env" + dest: /root/xci.env - hosts: localhost remote_user: root @@ -175,3 +171,8 @@ src: "{{ ansible_env.HOME }}/openrc" dest: "{{ XCI_PATH }}/.cache/openrc" flat: true + + - name: add public key to host + copy: + src: "{{ XCI_PATH }}/xci/files/authorized_keys" + dest: /root/.ssh/authorized_keys diff --git a/xci/installer/osa/playbooks/configure-targethosts.yml b/xci/installer/osa/playbooks/configure-targethosts.yml index fb43a920..31c3e02e 100644 --- a/xci/installer/osa/playbooks/configure-targethosts.yml +++ b/xci/installer/osa/playbooks/configure-targethosts.yml @@ -1,30 +1,5 @@ --- -- hosts: all - remote_user: root - tasks: - - name: add public key to host - copy: - src: "{{ XCI_PATH }}/xci/files/authorized_keys" - dest: /root/.ssh/authorized_keys - -- hosts: controller - remote_user: root - vars_files: - - "{{ XCI_PATH }}/xci/var/opnfv.yml" - - pre_tasks: - - name: Load distribution variables - include_vars: - file: "{{ item }}" - with_items: - - "{{ XCI_PATH }}/xci/var/{{ ansible_os_family }}.yml" - - "{{ XCI_FLAVOR_ANSIBLE_FILE_PATH }}/flavor-vars.yml" - roles: - - role: configure-network - # we need to force sync time with ntp or the nodes will be out of sync timewise - - role: synchronize-time - -- hosts: compute +- hosts: openstack remote_user: root vars_files: - "{{ XCI_PATH }}/xci/var/opnfv.yml" @@ -37,13 +12,16 @@ - "{{ XCI_PATH }}/xci/var/{{ ansible_os_family }}.yml" - "{{ XCI_FLAVOR_ANSIBLE_FILE_PATH }}/flavor-vars.yml" roles: - - role: configure-network - # we need to force sync time with ntp or the nodes will be out of sync timewise - - role: synchronize-time - - role: configure-ceph - when: XCI_CEPH_ENABLED == "true" - -- hosts: compute00 - remote_user: root - roles: + - role: bootstrap-host - role: configure-nfs + when: + - "'compute' in group_names" + - role: configure-ceph + when: + - XCI_CEPH_ENABLED == "true" + - "'compute' in group_names" + tasks: + - name: add public key to host + copy: + src: "{{ XCI_PATH }}/xci/files/authorized_keys" + dest: /root/.ssh/authorized_keys diff --git a/xci/playbooks/configure-localhost.yml b/xci/playbooks/configure-localhost.yml index a5b0e3fa..0e3cde6e 100644 --- a/xci/playbooks/configure-localhost.yml +++ b/xci/playbooks/configure-localhost.yml @@ -98,3 +98,8 @@ - OPENSTACK_OSA_DEV_PATH != "" when: - INSTALLER_TYPE == "osa" + + - name: Dump XCI execution environment to a file + shell: env > "{{ XCI_PATH }}/.cache/xci.env" + args: + executable: /bin/bash diff --git a/xci/playbooks/roles/.gitignore b/xci/playbooks/roles/.gitignore deleted file mode 100644 index e0b47770..00000000 --- a/xci/playbooks/roles/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -* -!.gitignore -!clone-repository/ -!configure-network/ -!configure-nfs/ -!prepare-functest/ -!remote-folders/ -!synchronize-time/ diff --git a/xci/playbooks/roles/bootstrap-host/defaults/main.yml b/xci/playbooks/roles/bootstrap-host/defaults/main.yml new file mode 100644 index 00000000..8e5a0e34 --- /dev/null +++ b/xci/playbooks/roles/bootstrap-host/defaults/main.yml @@ -0,0 +1,11 @@ +# SPDX-license-identifier: Apache-2.0 +############################################################################## +# Copyright (c) 2018 SUSE Linux GmbH and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +configure_network: yes +configure_time: yes diff --git a/xci/playbooks/roles/configure-network/files/network-config-suse b/xci/playbooks/roles/bootstrap-host/files/network-config-suse index 02cdd998..02cdd998 100755 --- a/xci/playbooks/roles/configure-network/files/network-config-suse +++ b/xci/playbooks/roles/bootstrap-host/files/network-config-suse diff --git a/xci/playbooks/roles/bootstrap-host/tasks/main.yml b/xci/playbooks/roles/bootstrap-host/tasks/main.yml new file mode 100644 index 00000000..7d6d259e --- /dev/null +++ b/xci/playbooks/roles/bootstrap-host/tasks/main.yml @@ -0,0 +1,15 @@ +--- +# SPDX-license-identifier: Apache-2.0 +############################################################################## +# Copyright (c) 2018 SUSE Linx GmbH and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +- include: network.yml + when: configure_network + +- include: time.yml + when: configure_time diff --git a/xci/playbooks/roles/configure-network/tasks/main.yml b/xci/playbooks/roles/bootstrap-host/tasks/network.yml index 01edf459..01edf459 100644 --- a/xci/playbooks/roles/configure-network/tasks/main.yml +++ b/xci/playbooks/roles/bootstrap-host/tasks/network.yml diff --git a/xci/playbooks/roles/synchronize-time/tasks/main.yml b/xci/playbooks/roles/bootstrap-host/tasks/time.yml index 8f94d33f..8f94d33f 100644 --- a/xci/playbooks/roles/synchronize-time/tasks/main.yml +++ b/xci/playbooks/roles/bootstrap-host/tasks/time.yml diff --git a/xci/playbooks/roles/configure-network/templates/debian/compute00.interface.j2 b/xci/playbooks/roles/bootstrap-host/templates/debian/compute00.interface.j2 index 2da12f20..2da12f20 100644 --- a/xci/playbooks/roles/configure-network/templates/debian/compute00.interface.j2 +++ b/xci/playbooks/roles/bootstrap-host/templates/debian/compute00.interface.j2 diff --git a/xci/playbooks/roles/configure-network/templates/debian/compute01.interface.j2 b/xci/playbooks/roles/bootstrap-host/templates/debian/compute01.interface.j2 index a74df1c2..a74df1c2 120000 --- a/xci/playbooks/roles/configure-network/templates/debian/compute01.interface.j2 +++ b/xci/playbooks/roles/bootstrap-host/templates/debian/compute01.interface.j2 diff --git a/xci/playbooks/roles/configure-network/templates/debian/controller00.interface.j2 b/xci/playbooks/roles/bootstrap-host/templates/debian/controller00.interface.j2 index c540f66e..c540f66e 100644 --- a/xci/playbooks/roles/configure-network/templates/debian/controller00.interface.j2 +++ b/xci/playbooks/roles/bootstrap-host/templates/debian/controller00.interface.j2 diff --git a/xci/playbooks/roles/configure-network/templates/debian/controller01.interface.j2 b/xci/playbooks/roles/bootstrap-host/templates/debian/controller01.interface.j2 index e835d7ca..e835d7ca 120000 --- a/xci/playbooks/roles/configure-network/templates/debian/controller01.interface.j2 +++ b/xci/playbooks/roles/bootstrap-host/templates/debian/controller01.interface.j2 diff --git a/xci/playbooks/roles/configure-network/templates/debian/controller02.interface.j2 b/xci/playbooks/roles/bootstrap-host/templates/debian/controller02.interface.j2 index e835d7ca..e835d7ca 120000 --- a/xci/playbooks/roles/configure-network/templates/debian/controller02.interface.j2 +++ b/xci/playbooks/roles/bootstrap-host/templates/debian/controller02.interface.j2 diff --git a/xci/playbooks/roles/configure-network/templates/debian/opnfv.interface.j2 b/xci/playbooks/roles/bootstrap-host/templates/debian/opnfv.interface.j2 index 03f81dbb..03f81dbb 100644 --- a/xci/playbooks/roles/configure-network/templates/debian/opnfv.interface.j2 +++ b/xci/playbooks/roles/bootstrap-host/templates/debian/opnfv.interface.j2 diff --git a/xci/playbooks/roles/configure-network/templates/redhat/bridge.ifcfg.j2 b/xci/playbooks/roles/bootstrap-host/templates/redhat/bridge.ifcfg.j2 index 06b5f177..06b5f177 100644 --- a/xci/playbooks/roles/configure-network/templates/redhat/bridge.ifcfg.j2 +++ b/xci/playbooks/roles/bootstrap-host/templates/redhat/bridge.ifcfg.j2 diff --git a/xci/playbooks/roles/configure-network/templates/redhat/interface.ifcfg.j2 b/xci/playbooks/roles/bootstrap-host/templates/redhat/interface.ifcfg.j2 index a97ad0cf..a97ad0cf 100644 --- a/xci/playbooks/roles/configure-network/templates/redhat/interface.ifcfg.j2 +++ b/xci/playbooks/roles/bootstrap-host/templates/redhat/interface.ifcfg.j2 diff --git a/xci/playbooks/roles/configure-network/templates/suse/suse.interface.j2 b/xci/playbooks/roles/bootstrap-host/templates/suse/suse.interface.j2 index 27b01eb4..27b01eb4 100644 --- a/xci/playbooks/roles/configure-network/templates/suse/suse.interface.j2 +++ b/xci/playbooks/roles/bootstrap-host/templates/suse/suse.interface.j2 diff --git a/xci/playbooks/roles/configure-network/templates/suse/suse.routes.j2 b/xci/playbooks/roles/bootstrap-host/templates/suse/suse.routes.j2 index 7c868447..7c868447 100644 --- a/xci/playbooks/roles/configure-network/templates/suse/suse.routes.j2 +++ b/xci/playbooks/roles/bootstrap-host/templates/suse/suse.routes.j2 diff --git a/xci/playbooks/roles/prepare-functest/templates/env.j2 b/xci/playbooks/roles/prepare-functest/templates/env.j2 index 43a581bd..af271ac7 100644 --- a/xci/playbooks/roles/prepare-functest/templates/env.j2 +++ b/xci/playbooks/roles/prepare-functest/templates/env.j2 @@ -1,7 +1,5 @@ -INSTALLER_TYPE=osa INSTALLER_IP=192.168.122.2 EXTERNAL_NETWORK={{ external_network }} -DEPLOY_SCENARIO="os-nosdn-nofeature-noha" CI_LOOP=daily TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results ENERGY_RECORDER_API_URL=http://energy.opnfv.fr/resources diff --git a/xci/playbooks/roles/prepare-functest/templates/run-functest.sh.j2 b/xci/playbooks/roles/prepare-functest/templates/run-functest.sh.j2 index c0b9bc88..81a0734f 100644 --- a/xci/playbooks/roles/prepare-functest/templates/run-functest.sh.j2 +++ b/xci/playbooks/roles/prepare-functest/templates/run-functest.sh.j2 @@ -1,5 +1,8 @@ #!/bin/bash +# Variables that we need to pass from XCI to functest +XCI_ENV=(INSTALLER_TYPE DEPLOY_SCENARIO XCI_FLAVOR) + source /root/openrc openstack --insecure network create --external \ @@ -14,6 +17,19 @@ openstack --insecure subnet create --network {{ external_network }} \ mkdir ~/results/ mkdir ~/images && cd ~/images && wget -q http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img && cd ~ +# Extract variables from xci.env file +if [[ -e /root/xci.env ]]; then + for x in ${XCI_ENV[@]}; do + grep "^${x}=" /root/xci.env >> /root/env + done +fi + +# Dump the env file +echo "------------------------------------------------------" +echo "------------- functest environment file --------------" +cat /root/env +echo "------------------------------------------------------" + sudo docker run --env-file env \ -v $(pwd)/openrc:/home/opnfv/functest/conf/env_file \ -v $(pwd)/images:/home/opnfv/functest/images \ diff --git a/xci/scripts/vm/start-new-vm.sh b/xci/scripts/vm/start-new-vm.sh index 76506830..6e5c8194 100755 --- a/xci/scripts/vm/start-new-vm.sh +++ b/xci/scripts/vm/start-new-vm.sh @@ -120,7 +120,7 @@ COMMON_DISTRO_PKGS=(vim strace gdb htop dnsmasq docker iptables ebtables virt-ma case ${ID,,} in *suse) pkg_mgr_cmd="sudo zypper -q -n ref" - pkg_mgr_cmd+=" && sudo zypper -q -n install ${COMMON_DISTRO_PKGS[@]} qemu-kvm qemu-tools libvirt-daemon libvirt-client libvirt-daemon-driver-qemu" + pkg_mgr_cmd+=" && sudo zypper -q -n install ${COMMON_DISTRO_PKGS[@]} qemu-tools libvirt-daemon libvirt-client libvirt-daemon-driver-qemu" ;; centos) pkg_mgr_cmd="yum updateinfo" @@ -188,6 +188,8 @@ sudo chown $uid:$gid -R $XCI_CACHE_DIR/clean_vm/images/ cp ${XCI_CACHE_DIR}/clean_vm/images/${OS}.qcow2* ${BASE_PATH}/ cp ${XCI_CACHE_DIR}/clean_vm/images/${OS}.qcow2.sha256.txt ${BASE_PATH}/deployment_image.qcow2.sha256.txt cp ${XCI_CACHE_DIR}/clean_vm/images/${OS}.qcow2 ${BASE_PATH}/deployment_image.qcow2 + +cd ${BASE_PATH} declare -r OS_IMAGE_FILE=${OS}.qcow2 [[ ! -e ${OS_IMAGE_FILE} ]] && echo "${OS_IMAGE_FILE} not found! This should never happen!" && exit 1 @@ -259,9 +261,9 @@ done # Fix up perms if needed to make ssh happy chmod 600 ${BASE_PATH}/xci/scripts/vm/id_rsa_for_dib* # Remove it from known_hosts -ssh-keygen -R $_ip || true -ssh-keygen -R ${VM_NAME} || true -ssh-keygen -R ${OPNFV_VM_IP} || true +for item in $_ip ${VM_NAME} ${OPNFV_VM_IP} ${VM_NAME}_opnfv; do + ssh-keygen -R $item || true +done # Initial ssh command until we setup everything vm_ssh="ssh -o StrictHostKeyChecking=no -i ${BASE_PATH}/xci/scripts/vm/id_rsa_for_dib -l devuser" @@ -355,7 +357,7 @@ echo "Verifying test script exists..." $vm_ssh ${VM_NAME} "bash -c 'stat ~/releng-xci/run_jenkins_test.sh'" if [[ $? != 0 ]]; then echo "Failed to find a 'run_jenkins_test.sh' script..." - if ${DEFAULT_XCI_TEST}; then + if [[ ${DEFAULT_XCI_TEST} == true ]]; then echo "Creating a default test case to run xci-deploy.sh" cat > ${BASE_PATH}/run_jenkins_test.sh <<EOF #!/bin/bash |
