summaryrefslogtreecommitdiffstats
path: root/docs/submodules/compass4nfv
AgeCommit message (Collapse)AuthorFilesLines
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>
2018-02-05Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "Seperate compass-tasks" - Seperate compass-tasks JIRA: - 1. Keep openstack-ansible in compass-tasks-osa. Keep kubespray in compass-tasks-k8s. Build different compass-tasks in one tar ball. Identify which one to use during docker-compose. 2. Temporarily using private docker repo. 3. COMPOSE_IMAGES is used to controll which components to form compass-core regardless of specific repo. Set default value for openstack and kubernetes when perform single cluster deploy. Change-Id: Ief52580e954c602575c9bf8abe5733c100876c7f Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
2018-02-05Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "Compass4nfv virtual deploy support direct connection" - Compass4nfv virtual deploy support direct connection compass4nfv using nat for VM external network currently, this patch add the direct connection method. if want to use it ,you need set the NAT_EXTERNAL to false, and configure the network.yml according to you environment Change-Id: I5a1a2f96b8c32a00eaef4d591c4452b555f0c9a2 Signed-off-by: wutianwei <wutianwei1@huawei.com>
2018-02-03Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "Update Barometer plugin to install influxdb, grafana" - Update Barometer plugin to install influxdb, grafana Adds/updates the following to install influxdb and grafana on the controller. Configures them to receive collectd data from the compute. /plugins/barometer/roles/influxdb /pluigns/barometer/roles/grafana /deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml Change-Id: Ie33489e9834da5bb5c77b392451b81cf44a849d6 Signed-off-by: ramamani yeleswarapu <ramamani.yeleswarapu@intel.com>
2018-02-03Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "Update Barometer plugin to use collectd container" - Update Barometer plugin to use collectd container Modifies/updates the following to use a barometer container from dockerhub for collectd. /plugins/barometer/roles/collectd/tasks /pluigns/barometer/roles/collectd/templates /plugins/barometer/roles/collectd/vars /plugins/barometer/roles/collectd/files Change-Id: I627afd8fef12c4aa3ff5ac54a55d00f9567406f2 Signed-off-by: ramamani yeleswarapu <ramamani.yeleswarapu@intel.com>
2018-01-31Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "Collect log from rsyslog container" - Collect log from rsyslog container JIRA: COMPASS-579 the script collect-log.sh would be called by releng, after all the deploy and tests job are complete. Change-Id: Ic2604ca0650989bc13310377427694ededf75a9d Signed-off-by: wutianwei <wutianwei1@huawei.com>
2018-01-30Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Add tacker support in compass4nfv for Fraser JIRA: COMPASS-577 1. Add tacker service into haproxy configuration file 2. Include tacker installation into setup-openstack.yml Change-Id: I5a91766e034ec55af711029aac4ba9ed4a388db2 Signed-off-by: Yifei Xue <xueyifei@huawei.com>
2018-01-30Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "Change gnocchi storage and increase the capacity of ceph" - Change gnocchi storage and increase the capacity of ceph 1. Change the gnocchi storage to ceph. 2. Change the size of loopback to 500GB 3. Change the ceilometer polling yaml 4. Run ceilometer-upgrade command and restart ceilometer service Change-Id: I8948c7b7e340c11e5d05c06a7d54c0e1b807620c Signed-off-by: wutianwei <wutianwei1@huawei.com>
2018-01-27Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Enable neutron port trunk JIRA: COMPASS-571 The network trunk service allows multiple networks to be connected to an instance using a single virtual NIC (vNIC). Multiple networks can be presented to an instance by connecting it to a single port. This is a highly relevant feature for VNFs and hence for OPNFV as a reference NFVI. This patch is about enabling the trunk port feature in Compass deployments. Change-Id: I270c3f1d5e4af99578c8e1882fae12ddddaabe78 Signed-off-by: Yifei Xue <xueyifei@huawei.com>
2018-01-27Update git submodulesHU Xinhui1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "Use run_dir instead of hard coding" - Use run_dir instead of hard coding Cluster name now can be set in DHA file which makes ansible dir changeable. Use run_dir variable to point to correct dir. Change-Id: I673b0b472b86ce505a8ea29ce4fb3666b4b991bd Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
2018-01-27Update git submoduleshu xinhui1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Change the scenario file for k8s api ha 1. Change the vm_environment config of k8-nosdn-nofeature-ha.yml 2. Change the hardware_environment config of k8-nosdn-nofeature-ha.yml Change-Id: Ia7654daf50c0c4b9f20e0851d41d25bf1051cb2d Signed-off-by: hu xinhui <xinhui_hu@foxmail.com>
2018-01-26Update git submodulesHU Xinhui1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "spport k8s apiserver HA compass installer deploy k8s using kubespray for default, but k8s apiserver HA is not implemented by kubespray, This patch aim is to achieve the k8s apiserver HA Change-Id: I805b5eb2f4efa7ca82fcef7bfd3f4cad35ed65b5 JIRA: - Signed-off-by: hu xinhui <xinhui_hu@foxmail.com>" - spport k8s apiserver HA compass installer deploy k8s using kubespray for default, but k8s apiserver HA is not implemented by kubespray, This patch aim is to achieve the k8s apiserver HA Change-Id: I805b5eb2f4efa7ca82fcef7bfd3f4cad35ed65b5 JIRA: - Signed-off-by: hu xinhui <xinhui_hu@foxmail.com>
2018-01-24Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "Fix subnet create fail when disable ext-net" - Fix subnet create fail when disable ext-net JIRA: COMPASS-575 Add missing condition check for subnet create task. Change-Id: Ibd25a7e7e4edd40be6b0f14bb8bffb828a65f648 Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
2018-01-24Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "docker-compose: support aarch64" - docker-compose: support aarch64 Change-Id: I4b1bce45f8412af7076dca90bbb4c1193057d110 Signed-off-by: Yibo Cai <yibo.cai@arm.com>
2018-01-24Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "deploy/cobbler: drop tcp_tw_recycle in sysctl.conf" - deploy/cobbler: drop tcp_tw_recycle in sysctl.conf Currently, tcp_tw_recycle is set explicitly in sysctl.conf when installing OS by cobbler. This option is removed in kernel4.12, current sysctl.conf breaks sysctl function and K8s deployment. Actually, tcp_tw_recycle is considered broken and not recommended to use. We may simply drop this option to be compatible with different kernel versions. References: - https://vincent.bernat.im/en/blog/2014-tcp-time-wait-state-linux - https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=4396e46187ca5070219b81773c4e65088dac50cc Change-Id: I2cd89db3d423c811ba58eb5960f3cc718475be5f Signed-off-by: Yibo Cai <yibo.cai@arm.com>
2018-01-22Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "Support multi-cluster deploy" - Support multi-cluster deploy JIRA: COMPASS-566 1. set DEPLOY_HOST to "true "no longer refresh compass-core 2. patch depends on merged compass-tasks 3. support assign cluster name in scenario file Change-Id: I28d201c201cff5baefee9993d195be16ef1e830b Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
2018-01-22Update git submodulesHarry Huang1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Using simplejson instead of json JIRA: COMPASS-574 As Ansible upgrade patch will bring in json module issue. Using simplejson module to avoid module confusion. Change-Id: I752b126e37753187fd74daa4fc6fe202f71eec24 Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
2018-01-15Update git submoduleswutianwei1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Fetch kubernetes admin.conf for test from kube_master fetch the admin.conf to the directory /opt/admin.conf of compass-tasks docker Change-Id: I1c236414c968f721d04fb6da0dc7a9514c892f93 Signed-off-by: wutianwei <wutianwei1@huawei.com>
2018-01-10Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Change the ntp server in chrony conf JIRA: - Use the ntp server in compass-cobbler. Change-Id: Ia5d3d8fb32ce51667841cec74622c7f0da929587 Signed-off-by: Yifei Xue <xueyifei@huawei.com>
2018-01-09Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Open log server of OSA JIRA: - Open log server of OpenStack Ansible to collect all of the logs in each LXC. Then it will be very convenient to debug. Change-Id: Iafd625a2af4eea04ff7528c9d8007bed1b218822 Signed-off-by: Yifei Xue <xueyifei@huawei.com>
2018-01-09Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Update the docker image source to use opnfv dockerhub JIRA: - Change the docker image source to opnfv dockerhub. Change-Id: I5709c99844d5df29d9a429a72db23c8deaf9feb0 Signed-off-by: Yifei Xue <xueyifei@huawei.com>
2018-01-09Update git submodulesHarry Huang1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Open fix_pip_version Due to OSA commit id rollback, open this fix_pip_version to fix ldap issue Change-Id: I9d41f0dcb04ecdc3d73b92a5da6fa254b5246045 Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
2017-12-28Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "change the failure judgement condition for setup-openstack" - change the failure judgement condition for setup-openstack 1. Don't check failed=1 instead of checking the last task name. 2. comment the fix pip version yml Change-Id: I3c22074f319a1d0f1ae0f3df43ca6e10ec684aac Signed-off-by: wutianwei <wutianwei1@huawei.com>
2017-12-27Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "Remove the /var/log/osa directory if exist" - Remove the /var/log/osa directory if exist generate password again to ensure the password is different everytime Change-Id: I8c88266e724922301f4411b330d7d7154bfb250e Signed-off-by: wutianwei <wutianwei1@huawei.com>
2017-12-26Update git submoduleswutianwei1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - fix the lz4 packages dependence 1. install pkgconfig 2. mv the tasks of fixing pip issue out of the main script Change-Id: Icc08a3c461690d1d6747455479df0a58d87d22da Signed-off-by: wutianwei <wutianwei1@huawei.com>
2017-12-22Update git submodulesHarry Huang1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Add compass-docker-compose 1. Add ansible for docker compose containerized compass 2. deploy/conf/compass.conf no longer specify image tags for runtime. build.yaml now is added into compass tarball to be the only place determine image tags 3. This patch is based on patch: https://gerrit.opnfv.org/gerrit/#/c/47393/ use merged compass-tasks 4. Tempoarily using private docker repo for compass-tasks. Switch to opnfv repo when patch https://gerrit.opnfv.org/gerrit/#/c/47329/ is merged 5. Modify ansible callback module accrodingly Change-Id: I0728a9002a1cc7804c9e8f13bd1afdccb684a159 Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
2017-12-21Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "Bug fix for chrony configuration" - Bug fix for chrony configuration JIRA: - Set "security_ntp_servers" to use only one server; Correct the path of chrony key for centos deployment. Change-Id: I3050018fe07c51912e0b52a1c5c7ce2dd4d3f6ce Signed-off-by: Yifei Xue <xueyifei@huawei.com>