summaryrefslogtreecommitdiffstats
path: root/docs/submodules/compass4nfv
AgeCommit message (Collapse)AuthorFilesLines
2018-05-08Update git submoduleswutianwei1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - add the command "rm /etc/resolve.conf" in cache_prep_commands Change-Id: I89b15e7e200d37ac5d44cfee974f0f1c63981625 Signed-off-by: wutianwei <wutianwei1@huawei.com>
2018-04-25Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Workaround for Tacker in HA scenarios JIRA: - For Tacker service in HA mode, it only generates VIM fernet key on one of the Tacker hosts. This may cause error when a request is been routed to another host. We need to use Barbican and Mistral components. But now OSA did not support Mistral yet. So we add a workaround here to get over this issue. Change-Id: I9aa228ec2ac7011cedb1eb503611ca24c7666caa Signed-off-by: Yifei Xue <xueyifei@huawei.com>
2018-04-20Update git submodulesHarry Huang1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Add option to choose deploy tool JIRA: COMPASS-596 There may be different kinds of deploy tools that be supported in future release of compass. Using option DEPLOY_TOOL to choose a deploy tool thus specify which compass-tasks will be brought up Change-Id: I92b69ebad412e70ccd28ef864fb485e485705dc9 Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
2018-04-17Update git submodulesYibo Cai1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - cobbler: support deploying ubuntu on arm Deploy ubuntu by setting ADAPTER_OS_PATTERN='(?i)ubuntu-16.*arm.*' and OS_VERSION=xenial. Change-Id: I1035a2d45225fceab6eead35d77d98130def373b Signed-off-by: Yibo Cai <yibo.cai@arm.com>
2018-04-16Update git submodulesHarry Huang1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "Add the Heapster + InfluxDB + Grafana Monitoring scheme" - Add the Heapster + InfluxDB + Grafana Monitoring scheme JIRA: 1. The kubernetes cluster deployed by the kubespary does not support the monitoring scheme. 2. This patch is to complete the monitoring scheme for k8s Change-Id: I89faf75a8b78cd70dfc9d8433ea582aecb2f8001 Signed-off-by: hu xinhui <xinhui_hu@foxmail.com>
2018-04-16Update git submodulesHarry Huang1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "support deploying k8s above ubuntu on arm" - support deploying k8s above ubuntu on arm Change-Id: I5642c866423728a8cdbbc3ea82969e6aec346981 Signed-off-by: Yibo Cai <yibo.cai@arm.com>
2018-04-16Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "Stor4nfv: Install ansible version 2.4" - Stor4nfv: Install ansible version 2.4 Ansible 2.5 release is causing errors in the installation of ceph-ansible (for ceph-mon). This patch fixes the ansible version installed on kube_master to 2.4.3 to address the ceph errors. Also, adds these post-install tasks: - run 'modprobe rbd' - create opensds default profile - create csi pods. Change-Id: Iee8d27da68896009d2e27ce4a6c7f805524d086d Signed-off-by: Ramamani Yeleswarapu <ramamani.yeleswarapu@intel.com>
2018-04-10Update git submoduleswutianwei1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Enable the neutron trunk Change-Id: Ieb5d505adc88644cfc1f802364064f5551a1ed53 Signed-off-by: wutianwei <wutianwei1@huawei.com>
2018-04-03Update git submodulesHarry Huang1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Fix pip version to 9.0.1 JIRA: COMPASS-593 OpenStack Ansible install latest pip on each contoller node and the latest pip (currently 10.0.0b1) doesn't support empty package list to be passed into it. Add a user config file to fix pip version. Change-Id: Ie193389c2b4995cdc4b81876f8cdcfc512cf5ea1 Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
2018-03-31Update git submoduleswutianwei1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Install PBR to ensure we're not breaking builds Change-Id: I4e7b47a8f2021a1cf25b80d7818f4dabb441c39f Signed-off-by: wutianwei <wutianwei1@huawei.com>
2018-03-29Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Documentation Update for Fraser release JIRA: - Update the document for the latest Fraser release. Change-Id: Ifec8630ba7a87e2245ae6294b1f39b09ee2a8b6f Signed-off-by: Yifei Xue <xueyifei@huawei.com>
2018-03-21Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "Fix Stor4nfv CI issues due to repo changes" - Fix Stor4nfv CI issues due to repo changes Applies the changes in stor4nfv repo and consolidates opensds and nbp inventories. This fixes the CI failure in stor4nfv scenarios. Change-Id: I91f291d52488771934e0e0e93da2c56715abc877 Signed-off-by: Ramamani Yeleswarapu <ramamani.yeleswarapu@intel.com>
2018-03-20Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "Fix workaround of image upload through horizon" - Fix workaround of image upload through horizon 1. using horizon group limit 2. set fact openstack_release to hostvars of localhost Change-Id: I0af0da1a508e862d0e2bb975f29897ec2948617f Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
2018-03-19Update git submoduleschigang1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - committer nomination for Harry Huang Hi team, I propose to nominate Harry as a committer of Compass4nfv. Harry did a lots of work in containized compass core and he is so kind to help fix Compass4nfv issues in Fraser release. More detailed contributions are listed: https://gerrit.opnfv.org/gerrit/#/q/owner:huangxiangyu5%2540huawei.com+status:merged+projects:compass4nfv please vote +2 if you agree with Harry's nomination. Change-Id: I3a8cbbe649688cb60271375bbfc09aa0eadfae3b Signed-off-by: chigang <chigang@huawei.com>
2018-03-19Update git submoduleschigang1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - committer nomination for Tianwei Wu Hi committers, I propose to nominate Tianwei as a committer of Compass4nfv. He did a great work in OpenStack and Ceph integration and very kind to help others to fix the issues of OpenStack-ansible. More detailed contributions are listed: https://gerrit.opnfv.org/gerrit/#/q/owner:wutianwei1%2540huawei.com+status:merged+projects:+compass4nfv Please vote +2 if you agree with Tianwei's nomanation. Change-Id: Ic5a534c6617d5c159ac18fa36ae63028d8a1e266 Signed-off-by: chigang <chigang@huawei.com>
2018-03-19Update git submoduleschigang1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - committer nomination for Yibo Cai Hi committers, I propose to nominate Yibo as a committer of Compass4nfv. Yibo did a great work in supporting Kubernetes running on ARM64 servers and Kubernetes scenarios integration in Fraser release. More detailed contributions are listed: https://gerrit.opnfv.org/gerrit/#/q/owner:yibo.cai%2540arm.com+status:merged Please vote +2 if you agree with Yibo's monination. Change-Id: Ie9ed38f9aac2a672e54d8ffac75c8e13eaf27871 Signed-off-by: chigang <chigang@huawei.com>
2018-03-19Update git submodulesJustin chi1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "Committer_nomination_rama" - Committer_nomination_rama Hi committers, I propose to nominate Rama as a committer of Compass4nfv. Rama did a great work in integration Barometer and Stor4nrfv, she did lots of contributrion in Compass4nfv scenarios integration in Fraser release. More detailed contributions are listed: https://gerrit.opnfv.org/gerrit/#/q/owner:ramamani.yeleswarapu%2540intel.com+status:merged Please +2 vote for Rama,if you agree with Rama's nomination. Change-Id: I08113e8b5eae5e6c461a47e83186d5e80c6e0946 Signed-off-by: chigang <chigang@huawei.com>
2018-03-19Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "Update collectd-gnocchi conf for DEFAULT_ARCHIVE_POLICY" - Update collectd-gnocchi conf for DEFAULT_ARCHIVE_POLICY * Configure the DEFAULT_ARCHIVE_POLICY option. * This will set the default archive policy to "high". Change-Id: I42fefc0e9a79fe1032c42156a21f95a96ad2a4ad Signed-off-by: Emma Foley <emma.l.foley@intel.com>
2018-03-19Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "Copy ml2_conf.ini to ODL hosts" - Copy ml2_conf.ini to ODL hosts JIRA: - SFC test cases in functest need to read ml2_conf.ini to get ODL controller's IP and port. However they can only gei this file from control nodes. So we copy this from neutron server containers to ODL hosts. Change-Id: I21acbaed6de924247d249d6c4015d9f90c763a08 Signed-off-by: Yifei Xue <xueyifei@huawei.com>
2018-03-18Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Bug fix for tacker installation JIRA: - By default, os_tacker will use "{{ tacker_bin | dirname }}/etc/tacker" as tacker_etc_dir. This will cause a failure when keystone creates fernet key for VIM in tacker due to keystone uses "/etc/tacker" by default. So this patch is proposed to set tacker_etc_dir to "/etc/tacker". Change-Id: Icbffaeb1376f83b4c9904b0258139ce1518ac9f8 Signed-off-by: Yifei Xue <xueyifei@huawei.com>
2018-03-16Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Add SDN controller's IP in openrc file for functest JIRA: COMPASS-590 From the time being, Functest ODL testcase calculates ODL ip thanks to Neutron IP. It should be calculated on Installer side (releng jobs) and set via SDN_CONTROLLER_IP in Functest env instead. https://git.opnfv.org/functest/tree/functest/opnfv_tests/sdn/odl/odl.py#n185 It ensures that Functest can rely on SDN_CONTROLLER_IP in all cases (OpenStack end users included) Change-Id: I01c0af952dbb21592aa973daaea3845346dc833f Signed-off-by: Yifei Xue <xueyifei@huawei.com>
2018-03-13Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "Modify deploy variable" - Modify deploy variable JIRA: - Under current deploy procedure, when compass containers are running, they will not be recreated during redeploy. Using DEPLOY_FIRST_TIME to determine to run the container create process when first time deploy Change-Id: Ic13fd84ed41afdad29c96f803feff3298cbbcfde Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
2018-03-09Update git submodulesJustin chi1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "add a multus with sriov interfaces installation" - add a multus with sriov interfaces installation Support deploying multus sriov CNI plugins by setting environment "kube_network_plugin" to "sriov". Change-Id: I3672fd7b6036063bdee57450c2100f39aa5ef68b Signed-off-by: Di Xu <di.xu@arm.com>
2018-03-06Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "Remove the password of openstack services in compass4nfv" - Remove the password of openstack services in compass4nfv JIRA: COMPASS-586 There are lots of hardcode about openstack service name and password. We would generate the services password randomly when running role config-osa. Change-Id: Ia0fec0c95a99d378febc837794e8ff550d10af4f Signed-off-by: wutianwei <wutianwei1@huawei.com>
2018-03-06Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Add git package for k8s deployment JIRA: - Ks8 deployment doesn't install git, this will cause failure in Stor4nfv scenarios. So proposing this patch to solve this. Change-Id: I98ab0b3a2a5f46eb1eebd4ea94fb60ccafe10272 Signed-off-by: Yifei Xue <xueyifei@huawei.com>
2018-03-05Update git submodulesYibo Cai1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - deploy/conf: add arm baremetal pod configuration - k8-nosdn-nofeature-noha.yml: 1 master + 1 slave - k8-nosdn-nofeature-ha.yml: 3 masters + 2 slaves Change-Id: I7cf4bfd7264bfdaf6d89841c8f39daf0d3d6bae2 Signed-off-by: Yibo Cai <yibo.cai@arm.com>
2018-03-02Update git submoduleswutianwei1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - move the update cache after role of setup-k8s-network If don't setup network, the host cannot connect to the Internet on baremetal pod. So we should update cache after setting the network. Change-Id: Ief0eb2d82c67b0ace2cfb233b9792f6e009a1524 Signed-off-by: wutianwei <wutianwei1@huawei.com>
2018-03-01Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "Update Stor4nfv plugin with nbp csi install" - Update Stor4nfv plugin with nbp csi install Change-Id: Ia32ea3c29b78f18aae258fa89b017e894b09301f Signed-off-by: ramamani yeleswarapu <ramamani.yeleswarapu@intel.com>
2018-02-28Update git submodulesJustin chi1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "Auto Generated INFO.yaml file" - Auto Generated INFO.yaml file INFO.yaml meant to be machine readable. This file was auto generated from an ldap lookup and your projects INFO file. Meeting times are not currently filled out. please ammend this patchset to complete Going forward comitter promotions should be done against this file. PTLs: Must be merged for you to gain delete access on testresults.opnfv.org Change-Id: I3144202a10825e7907be09cc3c66a4227c34064c Signed-off-by: agardner <agardner@linuxfoundation.org>
2018-02-28Update git submoduleswutianwei1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Add judgement for k8s stor4nfv Don't run storage roles when scenario isn't stor4nfv Change-Id: Ia8e65c90b58533427e74bad225aaa962d2583934 Signed-off-by: wutianwei <wutianwei1@huawei.com>
2018-02-28Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "modify the intel-pod17 k8s dha file" - modify the intel-pod17 k8s dha file Change-Id: I06e53449a68d8b4291e5c9c4682f42410f28ef68 Signed-off-by: wutianwei <wutianwei1@huawei.com>
2018-02-28Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "Update Barometer plugin - follow-up patch" - Update Barometer plugin - follow-up patch Modifies/updates the following: - Adds Hostname and enables all plugins in default_plugins - Adds rrdtool conf template - Adds a check to enable ExtraStats in virt conf only when rdt is not available. Change-Id: I7af7d86fadcaa0ccf3ba2b67d58c37e37ba84a73 Signed-off-by: ramamani yeleswarapu <ramamani.yeleswarapu@intel.com>
2018-02-27Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "Enable CSI plugin for Stor4nfv scenario" - Enable CSI plugin for Stor4nfv scenario JIRA: - Add some configurations to enable CSI plugin in k8s v1.9 which is used by Stor4nfv scenario. Change-Id: I78e0b39f31ff666eace50921c691107154dcb249 Signed-off-by: Yifei Xue <xueyifei@huawei.com>
2018-02-27Update git submoduleswutianwei1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Add dha files Add the huawei-pod1 and huawei-pod2 k8s dha files Change-Id: Id191c6d18508f15d9032a2cb3d0f563c059a7d53 Signed-off-by: wutianwei <wutianwei1@huawei.com>
2018-02-27Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "set the kubernetes variable" - set the kubernetes variable According to DEPLOY_SCENARIO, we set different nfvi and distro. Change-Id: I3082923fc7d4a1309c1de83f988f831d67c10d64 Signed-off-by: wutianwei <wutianwei1@huawei.com>
2018-02-27Update git submodulesHarry Huang1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Set storage role optional JIRA: - storage_master and storage_node role are currently required in kubernetes scenario which cause scenario with no storage_master or storage_node fails to be deployed. Change-Id: I0fd28a7fd4a6161be96044382ea509832473dc71 Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
2018-02-27Update git submodulesJustin chi1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "doc: add arm deployment guide" - doc: add arm deployment guide Change-Id: Ib66003003ea4697e9634201802e9169bc53a8ade Signed-off-by: Yibo Cai <yibo.cai@arm.com>
2018-02-27Update git submodulesramamani yeleswarapu1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Add plugin for Stor4nfv for k8s deploy - Adds 'stor4nfv' plugin which installs OpenSDS using stor4nfv. - Adds k8s-nosdn-stor4nfv-ha scenario file. - Adds k8s-nosdn-stor4nfv-noha scenario file. Change-Id: Iee718a48994ad4e55f4b7a01933bd4e7773ac67f Signed-off-by: ramamani yeleswarapu <ramamani.yeleswarapu@intel.com>
2018-02-24Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "build/arm64: separate compass-tasks" - build/arm64: separate compass-tasks Follow up https://gerrit.opnfv.org/gerrit/51227/ Change-Id: I9d86af5fe0c74b4fb06e018e783220ee6b8728ee Signed-off-by: Yibo Cai <yibo.cai@arm.com>
2018-02-22Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "add a multus with 2 fannel interfaces installation" - add a multus with 2 fannel interfaces installation Support deploying multus multiple flannel CNI plugins by setting environment "kube_network_plugin" to "2flannel". Change-Id: I23a3d42452b4a5e0858a18934f508649f5961e7a Signed-off-by: Di Xu <di.xu@arm.com>
2018-02-21Update git submodulesHarry Huang1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Support featrue plugin for k8s JIRA: COMPASS-587 Enable plugin siwtch list for k8s scenario. Change-Id: Id9286567faf47be2bbaa7982a6fcadea92e16ad2 Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
2018-02-17Update git submodulesHU Xinhui1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "deploy/conf: add ha role to k8 scenario" - deploy/conf: add ha role to k8 scenario Only K8s ha scenario is supported now. This noha scenario is broken. Add minor fixup so we can still use it to deploy K8s on two nodes. Change-Id: I3a763fe07ea2d31cd3ae049621e3d978c1bca4be Signed-off-by: Yibo Cai <yibo.cai@arm.com>
2018-02-13Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Update the odl_sfc plugin to use the latest version JIRA: - We have upgraded odl version to nitrogen SR1. So this patch we are going to update the odl_sfc plugin to satisfy the latest odl version. Change-Id: I7342fad58c0ae21f918e27e9d72deae214c2af4e Signed-off-by: Yifei Xue <xueyifei@huawei.com>
2018-02-11Update git submodulesHU Xinhui1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "change k8s version to v1.9.1" - change k8s version to v1.9.1 JIRA: - 1. compass4nfv can deploy v1.9.1 kubernetes 2. end user can use the kubernetes dashboard Change-Id: I274dda38599da95f382dfcb4159b530da8422fd8 Signed-off-by: hu xinhui <xinhui_hu@foxmail.com>
2018-02-08Update git submodulesHarry Huang1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Add workaround for horizon image upload issue JIRA: COMPASS-573 1. With HORIZON_IMAGES_UPLOAD_MODE set to direct Horizon provides the endpoint for Glance based on OPENSTACK_ENDPOINT_TYPE. If OPENSTACK_ENDPOINT_TYPE is set to internalURL any browser outside the internal network is unable to upload image. Add ansible task to set HORIZON_IMAGES_UPLOAD_MODE to legacy as a workaround. 2. Add ansible lookup plugin to get openstack release 3. set openstack_release into group_vars/all in config-osa to make this variable readable for other tasks Change-Id: I9ef358e1f4acb0c329a032e18359de12284f3b56 Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
2018-02-06Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Bug fix for tacker installation on centos7 JIRA: - Currently there is no variable definition file of tacker for centos in os_tacker repo. This will lead an error while including vars on centos deployment. So this patch will add a file named "redhat-7.yml" for centos. Change-Id: I965834adb0d2d25e5a68a9c7dbb397342108078f Signed-off-by: Yifei Xue <xueyifei@huawei.com>
2018-02-06Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "Fix some hard coding for some ip assignments" - Fix some hard coding for some ip assignments JIRA: COMPASS-570 1. fix hard coding in ip assignments for install network. support full ip assignments from network.yml 2. remove some used config item in deploy/conf Change-Id: I566b74f4a55e6b96af3ee9f41d1e183a73424a91 Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
2018-02-06Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "deploy: remove gic version in arm vm template" - deploy: remove gic version in arm vm template GIC version is set to v2 in current Arm VM template, but ThunderX only supports GICv3 which results in the failure to start VM. This patch removes GIC version definition and let libvirt to figure out the default value based on host system. Change-Id: I0e487e13ee4192a705f635781b1071521f610db5 Signed-off-by: Yibo Cai <yibo.cai@arm.com>
2018-02-06Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "Ansible callback support both V2.3 and V2.4" - Ansible callback support both V2.3 and V2.4 JIRA: COMPASS-585 1. Add conditional branch to support both ansible versions 2. Keep callback in ansible_plugins directory which will contains all plugins upcoming in the future Change-Id: I11f3d9700e07ad5bd7f03ad56f4e0bc061df05ec Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
2018-02-06Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "Upgrade ODL version to Nitrogen SR1" - Upgrade ODL version to Nitrogen SR1 JIRA: - Currently compass uses ODL Nitrogen, however the latest ODL version is Nitrogen SR1. So we upgrade to use the latest version to avoid some bugs. Change-Id: I8cc04955b9fc828eb3bc6096df6ac5b97438a259 Signed-off-by: Yifei Xue <xueyifei@huawei.com>