diff options
| -rw-r--r-- | deploy/config/vm_environment/zte-virtual2/network.yml | 8 | ||||
| -rw-r--r-- | docs/development/design/ci.rst | 40 | ||||
| -rw-r--r-- | docs/development/design/index.rst | 1 | ||||
| -rw-r--r-- | docs/development/design/multicast.rst | 7 | ||||
| -rw-r--r-- | docs/release/installation/bmdeploy.rst | 35 | ||||
| -rw-r--r-- | docs/release/installation/vmdeploy.rst | 41 | ||||
| -rw-r--r-- | templates/virtual_environment/vms/all_in_one.xml | 2 | ||||
| -rw-r--r-- | tools/daisy-post-fip.sh | 63 |
8 files changed, 171 insertions, 26 deletions
diff --git a/deploy/config/vm_environment/zte-virtual2/network.yml b/deploy/config/vm_environment/zte-virtual2/network.yml index 7b4a501c..0bbbae80 100644 --- a/deploy/config/vm_environment/zte-virtual2/network.yml +++ b/deploy/config/vm_environment/zte-virtual2/network.yml @@ -46,12 +46,6 @@ networks: - start: '10.20.11.3' end: '10.20.11.10' name: 'TENANT' - - cidr: '100.20.11.0/24' - gateway: '100.20.11.1' - ip_ranges: - - start: '100.20.11.3' - end: '100.20.11.10' - name: 'HEARTBEAT' interfaces: - name: 'EXTERNAL' interface: 'ens8' @@ -63,7 +57,5 @@ interfaces: interface: 'ens3' - name: 'TENANT' interface: 'ens3' - - name: 'HEARTBEAT' - interface: 'ens9' internal_vip: '10.20.11.11' public_vip: '10.20.11.11' diff --git a/docs/development/design/ci.rst b/docs/development/design/ci.rst new file mode 100644 index 00000000..39a8a63f --- /dev/null +++ b/docs/development/design/ci.rst @@ -0,0 +1,40 @@ +.. This work is licensed under a Creative Commons Attribution 4.0 International License. +.. http://creativecommons.org/licenses/by/4.0 + +CI Job Introduction +=================== + +CI Base Architech +----------------- + +https://wiki.opnfv.org/display/INF/CI+Evolution + +Project Gating And Daily Deployment Test +---------------------------------------- + +To save time, currently, Daisy4NFV does not run deployment test in gate job which simply builds and +uploads artifacts to low confidence level repo. The project deployment test is triggered on a daily +basis. If the artifact passes the test, then it will be promoted to the high confidence level repo. + +The low confidence level artifacts are bin files in http://artifacts.opnfv.org/daisy.html named like +"daisy/opnfv-Gerrit-39495.bin", while the high confidence level artifacts are named like +"daisy/opnfv-2017-08-20_08-00-04.bin". + +The daily project deployment status can be found at + +https://build.opnfv.org/ci/job/daisy-daily-master/ + +Production CI +------------- + +The status of Daisy4NFV's CI/CD which running on OPNFV production CI environments(both B/M and VM) +can be found at + +https://build.opnfv.org/ci/job/daisy-os-nosdn-nofeature-ha-baremetal-daily-master/ +https://build.opnfv.org/ci/job/daisy-os-odl-nofeature-ha-baremetal-daily-master/ +https://build.opnfv.org/ci/job/daisy-os-nosdn-nofeature-ha-virtual-daily-master/ +https://build.opnfv.org/ci/job/daisy-os-odl-nofeature-ha-virtual-daily-master/ + +Dashboard for taking a glance on CI health status in a more intuitive way can be found at + +http://testresults.opnfv.org/reporting/functest/release/master/index-status-daisy.html diff --git a/docs/development/design/index.rst b/docs/development/design/index.rst index bc5e9f40..5d9af98e 100644 --- a/docs/development/design/index.rst +++ b/docs/development/design/index.rst @@ -12,5 +12,6 @@ Design Docs for Daisy4nfv :numbered: :maxdepth: 2 + ci.rst multicast.rst diff --git a/docs/development/design/multicast.rst b/docs/development/design/multicast.rst index 89422fe6..f865edab 100644 --- a/docs/development/design/multicast.rst +++ b/docs/development/design/multicast.rst @@ -1,5 +1,8 @@ -Detailed Design -=============== +.. This work is licensed under a Creative Commons Attribution 4.0 International License. +.. http://creativecommons.org/licenses/by/4.0 + +Kolla Image Multicast Design +============================ Protocol Design --------------- diff --git a/docs/release/installation/bmdeploy.rst b/docs/release/installation/bmdeploy.rst index 47a8e121..ddb30f22 100644 --- a/docs/release/installation/bmdeploy.rst +++ b/docs/release/installation/bmdeploy.rst @@ -130,13 +130,33 @@ Start Deployment (Bare Metal Deployment) (1) Git clone the latest daisy4nfv code from opnfv: "git clone https://gerrit.opnfv.org/gerrit/daisy" -(2) Download latest bin file(such as opnfv-2017-06-06_23-00-04.bin) of daisy from http://artifacts.opnfv.org/daisy.html and change the bin file name(such as opnfv-2017-06-06_23-00-04.bin) to opnfv.bin +(2) Download latest bin file(such as opnfv-2017-06-06_23-00-04.bin) of daisy from +http://artifacts.opnfv.org/daisy.html and change the bin file name(such as opnfv-2017-06-06_23-00-04.bin) +to opnfv.bin. Check the https://build.opnfv.org/ci/job/daisy-os-odl-nofeature-ha-baremetal-daily-master/, +and if the 'snaps_health_check' of functest result is 'PASS', +you can use this verify-passed bin to deploy the openstack in your own environment + +(3) Assumed cloned dir is $workdir, which laid out like below: +[root@daisyserver daisy]# ls +ci deploy docker INFO LICENSE requirements.txt templates tests tox.ini +code deploy.log docs known_hosts setup.py test-requirements.txt tools +Make sure the opnfv.bin file is in $workdir + +(4) Enter into the $workdir, which laid out like below: +[root@daisyserver daisy]# ls +ci code deploy docker docs INFO LICENSE requirements.txt setup.py templates test-requirements.txt tests tools tox.ini +Create folder of labs/zte/pod2/daisy/config in $workdir + +(5) Move the ./deploy/config/bm_environment/zte-baremetal1/deploy.yml and +./deploy/config/bm_environment/zte-baremetal1/network.yml +to labs/zte/pod2/daisy/config dir. -(3) Make sure the opnfv.bin file is in daisy4nfv code dir - -(4) Create folder of labs/zte/pod2/daisy/config in daisy4nfv code dir - -(5) Move the ./deploy/config/bm_environment/zte-baremetal1/deploy.yml and ./deploy/config/bm_environment/zte-baremetal1/network.yml to labs/zte/pod2/daisy/config dir. +Note: +If selinux is disabled on the host, please delete all xml files section of below lines in dir templates/physical_environment/vms/ + <seclabel type='dynamic' model='selinux' relabel='yes'> + <label>system_u:system_r:svirt_t:s0:c182,c195</label> + <imagelabel>system_u:object_r:svirt_image_t:s0:c182,c195</imagelabel> + </seclabel> (6) Config the bridge in jumperserver,make sure the daisy vm can connect to the targetnode,use the command below: brctl addbr br7 @@ -147,4 +167,5 @@ service network restart (7) Run the script deploy.sh in daisy/ci/deploy/ with command: sudo ./ci/deploy/deploy.sh -b ../daisy -l zte -p pod2 -s os-nosdn-nofeature-noha -(8) When deploy successfully,the floating ip of openstack is 10.20.7.11,the login account is "admin" and the password is "keystone" +(8) When deploy successfully,the floating ip of openstack is 10.20.7.11, +the login account is "admin" and the password is "keystone" diff --git a/docs/release/installation/vmdeploy.rst b/docs/release/installation/vmdeploy.rst index 5da3949b..64d16a96 100644 --- a/docs/release/installation/vmdeploy.rst +++ b/docs/release/installation/vmdeploy.rst @@ -134,20 +134,45 @@ HeartBeat network is selected,and if it is configured in network.yml,the keepali Start Deployment (Virtual Deployment) ------------------------------------- -(1) Git clone the latest daisy4nfv code from opnfv: "git clone https://gerrit.opnfv.org/gerrit/daisy" +(1) Git clone the latest daisy4nfv code from opnfv: "git clone https://gerrit.opnfv.org/gerrit/daisy", +make sure the current branch is master -(2) Download latest bin file(such as opnfv-2017-06-06_23-00-04.bin) of daisy from http://artifacts.opnfv.org/daisy.html and change the bin file name(such as opnfv-2017-06-06_23-00-04.bin) to opnfv.bin +(2) Download latest bin file(such as opnfv-2017-06-06_23-00-04.bin) of daisy from +http://artifacts.opnfv.org/daisy.html and change the bin file name(such as opnfv-2017-06-06_23-00-04.bin) +to opnfv.bin. Check the https://build.opnfv.org/ci/job/daisy-os-odl-nofeature-ha-baremetal-daily-master/, +and if the 'snaps_health_check' of functest result is 'PASS', +you can use this verify-passed bin to deploy the openstack in your own environment -(3) Make sure the opnfv.bin file is in daisy4nfv code dir +(3) Assumed cloned dir is $workdir, which laid out like below: +[root@daisyserver daisy]# ls +ci code deploy docker docs INFO LICENSE requirements.txt setup.py templates test-requirements.txt tests tools tox.ini +Make sure the opnfv.bin file is in $workdir -(4) Create folder of labs/zte/virtual1/daisy/config in daisy4nfv code dir +(4) Enter into $workdir, Create folder of labs/zte/virtual1/daisy/config in $workdir -(5) Move the daisy/deploy/config/vm_environment/zte-virtual1/deploy.yml and daisy/deploy/config/vm_environment/zte-virtual1/network.yml to labs/zte/virtual1/daisy/config dir. +(5) Move the deploy/config/vm_environment/zte-virtual1/deploy.yml and +deploy/config/vm_environment/zte-virtual1/network.yml to +labs/zte/virtual1/daisy/config dir. Note: -zte-virtual1 config file is just for all-in-one deployment,if you want to deploy openstack with five node(1 lb node and 4 computer nodes),change the zte-virtual1 to zte-virtual2 +zte-virtual1 config file deploy openstack with five nodes(3 lb nodes and 2 computer nodes), +if you want to deploy an all-in-one openstack, change the zte-virtual1 to zte-virtual2 + +Note: +If selinux is disabled on the host, please delete all xml files section of below lines in dir templates/virtual_environment/vms/ + <seclabel type='dynamic' model='selinux' relabel='yes'> + <label>system_u:system_r:svirt_t:s0:c182,c195</label> + <imagelabel>system_u:object_r:svirt_image_t:s0:c182,c195</imagelabel> + </seclabel> (6) Run the script deploy.sh in daisy/ci/deploy/ with command: -sudo ./ci/deploy/deploy.sh -b ../daisy -l zte -p virtual1 -s os-nosdn-nofeature-noha +sudo ./ci/deploy/deploy.sh -b ./ -l zte -p virtual1 -s os-nosdn-nofeature-ha + +Note: +The value after -p parameter(virtual1) is get from labs/zte/virtual1/daisy/config/ +The value after -l parameter(zte) is get from labs/ +The value after -s "os-nosdn-nofeature-ha" used for deploy multinode openstack +The value after -s "os-nosdn-nofeature-noha" used for deploy all-in-one openstack -(7) When deploy successfully,the floating ip of openstack is 10.20.11.11,the login account is "admin" and the password is "keystone" +(7) When deploy successfully,the floating ip of openstack is 10.20.11.11, +the login account is "admin" and the password is "keystone" diff --git a/templates/virtual_environment/vms/all_in_one.xml b/templates/virtual_environment/vms/all_in_one.xml index 15f0305c..99725958 100644 --- a/templates/virtual_environment/vms/all_in_one.xml +++ b/templates/virtual_environment/vms/all_in_one.xml @@ -2,7 +2,7 @@ <name>all_in_one</name> <memory unit='KiB'>16777216</memory> <currentMemory unit='KiB'>16777216</currentMemory> - <vcpu placement='static'>4</vcpu> + <vcpu placement='static'>8</vcpu> <resource> <partition>/machine</partition> </resource> diff --git a/tools/daisy-post-fip.sh b/tools/daisy-post-fip.sh new file mode 100644 index 00000000..80d79e38 --- /dev/null +++ b/tools/daisy-post-fip.sh @@ -0,0 +1,63 @@ +#!/bin/bash + +############################################################################## +# Copyright (c) 2016 ZTE Coreporation 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 +############################################################################## + +IMAGE_NAME=TestVM + +# Sanitize language settings to avoid commands bailing out +# with "unsupported locale setting" errors. +unset LANG +unset LANGUAGE +LC_ALL=C +export LC_ALL +for i in curl openstack; do + if [[ ! $(type ${i} 2>/dev/null) ]]; then + if [ "${i}" == 'curl' ]; then + echo "Please install ${i} before proceeding" + else + echo "Please install python-${i}client before proceeding" + fi + exit + fi +done + +# Move to top level directory +REAL_PATH=$(python -c "import os,sys;print os.path.realpath('$0')") +cd "$(dirname "$REAL_PATH")/.." + +# Test for credentials set +if [[ "${OS_USERNAME}" == "" ]]; then + echo "No Keystone credentials specified. Try running source openrc" + exit +fi + +echo "Configuring tenant network." + +openstack network create --provider-network-type vxlan demo-net +openstack subnet create --subnet-range 10.0.0.0/24 --network demo-net \ + --gateway 10.0.0.1 --dns-nameserver 8.8.8.8 demo-subnet +DEMO_NET_ID=$(openstack network list | awk '/ demo-net / {print $2}') + +openstack router create demo-router +openstack router add subnet demo-router demo-subnet +openstack router set --external-gateway admin_external demo-router + +openstack floating ip create admin_external +DEMO_FIP=$(openstack floating ip list | awk '/ None / {print $4}') + +openstack server create --image ${IMAGE_NAME} --flavor m1.micro \ + --nic net-id=${DEMO_NET_ID} demo1 + +# Wait for guest ready to accept FIP, seems need it. +sleep 10 + +openstack server add floating ip demo1 ${DEMO_FIP} + +echo "Now you can test ping ${DEMO_FIP} from external network" |