summaryrefslogtreecommitdiffstats
path: root/docs
AgeCommit message (Collapse)AuthorFilesLines
2017-11-27Update git submodulesGuo Ruijing1-0/+0
* Update docs/submodules/container4nfv from branch 'master' - fix verify jenkins failure Change-Id: I0d9d33ea263112c627122d5af570578bc3f2284f Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
2017-11-27Update git submodulesLinda Wang1-0/+0
* Update docs/submodules/functest from branch 'master' - Remove os_utils call from cloudify ims and vrouter Change-Id: I333551125616113484ad275820f2176dae79da6e Signed-off-by: Linda Wang <wangwulin@huawei.com>
2017-11-27Update git submodulesgrakiss1-0/+0
* Update docs/submodules/dovetail from branch 'master' - [cvp-web] Bugfix: Total num of test cases should be fixed JIRA: DOVETAIL-552 The total num of test cases is decided by the number of the test cases users uploaded to the Web now. The total num should be fixed. For example, the total num of mandatory test cases should be 215. The total num of optional test cases should be 63. Change-Id: I6f7055bbeceb80f831af7d800b1a5aca4e165c45 Signed-off-by: grakiss <grakiss.wanglei@huawei.com>
2017-11-27Update git submodulesgrakiss1-0/+0
* Update docs/submodules/dovetail from branch 'master' - [cvp-web] Admin can approve and not approve results JIRA: DOVETAIL-562 According to the CVP workflow, once a result has been submitted to review, the admin will send email to all reviewers to get the comment (+1 / -1). Enable admin to approve/not approve the result after he gets the feedback from all reviewers. Otherwise, the result will always be in 'review' status. Change-Id: Ic3ace3c7284c70e9a8186d03e6cd88c91ecc76f9 Signed-off-by: grakiss <grakiss.wanglei@huawei.com>
2017-11-27Update git submodulesMichael Polenchuk1-0/+0
* Update docs/submodules/fuel from branch 'master' - Merge "[baremetal] MaaS: Fix adding mcp.rsa.pub" - [baremetal] MaaS: Fix adding mcp.rsa.pub Upstream salt-formula-maas change [1] gated applying "maas_sshprefs" low state by `region.sshprefs` being declared in reclass, which is not true for our model. Mend our region.sls patch to pass mcp.rsa.pub to MaaS unconditionally. This fixes baremetal SSH login with mcp.rsa. While at it, fix duplicate SSH key upload on MaaS state retry. JIRA: FUEL-281 [1] https://github.com/salt-formulas/salt-formula-maas/commit/ec61dd6 Change-Id: I93941a689058f9f48f34861898fbe3ee6ce4e2b4 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-11-27Update git submodulesMichael Polenchuk1-0/+0
* Update docs/submodules/fuel from branch 'master' - Merge "[baremetal] Retry cinder.controller on failure" - [baremetal] Retry cinder.controller on failure Occasionally, cinderng.volume_type_present errors with: ClientException: Service Unavailable (HTTP 503) Instead of retrying the whole state file, use `wait_for` macro to retry only this high state up to 5 times. Change-Id: Ib9ef017aca737e53c853007c13107d56d856c016 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-11-27Update git submodulesMichael Polenchuk1-0/+0
* Update docs/submodules/fuel from branch 'master' - Merge "Revert "Apply apache state on proxy nodes"" - Revert "Apply apache state on proxy nodes" Upstream fixed the salt-formula-horizon in commit 95387ec, by defining 8078 (and only that) port in Apache's ports.conf. This fixes the port 80 overlap, so running the `apache` high state after the `horizon` high state not only is unnecessary now, but also would lead to new breakage, since `apache` state would overwrite the ports.conf (removing 8078 and adding 80), i.e. creating a new port conflict and breaking Horizon port completely. This reverts commit eb4645206d6d74992fca3b8726ee2eebca97205f. Conflicts: mcp/config/states/openstack_ha mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> Change-Id: Iea8f0bd90ee8d12f399aad16247dda274d6a907a
2017-11-26Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/armband from branch 'master' - u/fuel: Bump & rebase for image pre-install 1. Bump to latest Fuel@OPNFV to include: - Bring in newer glusterfs for mtime unsplit brain * Requires adding arch "arm64" to PPA definition in reclass: - (reclass-system) linux.system.repo.glusterfs: Add arm64 arch - Switch nofeature-ha compute nodes to UCA repo * Requires an alternative way of adding linux.enea.com repos; * linux.enea.com repos will now be pre-install into VM images; * Requires refresh on repo arch list handled by Armband patch: - (fuel) baremetal, virtual: Extend arch list for UCA repo 2. Staging proposed patches from upstream Fuel@OPNFV: - Add pre-{install,purge} support for base image * Reference implementation adds pre-installed Armband specifics: - Enea public GPG to APT keys (for below repos); - repos (linux.enea.com/{apt-mk,mcp-repos}/*); - linux-{image,headers}-generic-hwe-16.04-edge; - cloud-init: datasource from NoCloud only; * Allows us to drop kernel installation from state files, installing the kernel only once during image prep, instead of two stages of parallel installs (5 baremetal, 14 VCP); * Ensures Armband repos are pre-configured for infrastructure VMs, allowing us to drop more reclass repo definitions; * Rework armband patch to install kernel only on kvm, cmp: - (fuel) baremetal: linux-image-generic-hwe-16.04-edge 3. Sync reclass repo definitions with upstream change, drop duplicates - [linux][repos] Remove unused repositories [1] * Upstream dropped all "ocata-{security,hotfix,...} repo comps, which are also empty for Armband, so drop them too; * Rework following armband patches: - (reclass-system) linux/system/repo/mcp: Add Armband repos * Move Armband repos to new dedicated reclass classes: - linux.system.repo.mcp.armband.extra (currently empty); - linux.system.repo.mcp.armband.openstack; * Use HTTPS for fetching Enea Armband GPG key; - (fuel) baremetal: Add Armband Openstack repos to kvm, cmp * Consume defs introduced above only on baremetal nodes; 4. Sync documentation with Fuel@OPNFV (cp) 5. Add vim swap files to .gitignore [1] https://github.com/Mirantis/reclass-system-salt-model/commit/1dd1b31 Change-Id: Ibab56279de86f08ad7cd9bc6761f4c525532f811 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-11-26Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/armband from branch 'master' - u/fuel: Bump & rebase for new deploy arg `-E` Slight refactor of Armband high states, combine all parts touching salt minion into a single `armband.salt_minion` state. Also bring in support for NVRAM-backed domain undefine via `virt.purge` by passing down the proper flag to libvirt. While at it, squash mcp/patches touching the same lines of code in <_modules/seedng.py>, so deploys using `-f` do not fail at the patch stage (due to conflicting patch lines, checking for `patch -R` does not work as expected). Change-Id: Iefca061e641854d28bd8576f2b4547c87c239e32 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-11-25Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'master' - Bring in newer glusterfs for mtime unsplit brain Recent commit 8ba3a1a (Switch nofeature-ha compute nodes to UCA repo) bumped the reclass/system submodule and brought in upstream commit 2ee306b (Glusterfs: use automatic mtime-based split-brain resolution) which requires support for "cluster.favorite-child-policy", not available in Glusterfs 3.7.x available in Ubuntu Xenial. NOTE: UCA does not provide glusterfs for "Ocata", only for "Pike"+. Instead of reverting the commit switching to mtime brain un-split, bump glusterfs to a version that is not EOL (3.10) using their official PPA. Change-Id: I4606dda2f3d4b7563eea793cc8e5d1380f336f24 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-11-25Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Update kolla image Change-Id: I7c7b6b10c5acc72f0de70703824e2034494eae77 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-11-25Update git submodulesBryan Sullivan1-0/+0
* Update docs/submodules/ves from branch 'master' - Build docker image for ves-app JIRA: VES-2 Change-Id: I3b953b882d080d6e9ecaa8600bde92acb34dc538 Signed-off-by: Bryan Sullivan <bryan.sullivan@att.com>
2017-11-25Update git submodulesXuan Jia1-0/+0
* Update docs/submodules/container4nfv from branch 'master' - Merge "build ovsdpdk cni during deployment" - build ovsdpdk cni during deployment Change-Id: I1c3d4b44bab0d75fae93f7fabce7bcfdcc3b9f35 Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
2017-11-25Update git submodulesXuan Jia1-0/+0
* Update docs/submodules/container4nfv from branch 'master' - Merge "remove timemout for k8s installation" - remove timemout for k8s installation Change-Id: I53d9bccfecd369ca3612dc12c3e5bb06b209961e Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
2017-11-25Update git submodulesGuo Ruijing1-0/+0
* Update docs/submodules/container4nfv from branch 'master' - extend opnfv/container4nfv box to 400G Change-Id: Id5aaf1cb6be6797ac179d94fec93607481481c5e Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
2017-11-24Update git submodulesagardner1-0/+0
* Update docs/submodules/pharos from branch 'master' - Jenkins does not have /usr/local/bin/ in path Stupid jenkins Change-Id: Ibfd83e7dadd674cfe7d7a9c2a712ef069fb8d5de Signed-off-by: agardner <agardner@linuxfoundation.org>
2017-11-24Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Move check-jinja2 jenkins job to pharos project" - Move check-jinja2 jenkins job to pharos project Securedlab will be going away now that we can encrypt strings (eyaml) we need to check jinja2 PDF templates that will be moving into pharos This adds a jenkins job to check those templates After This change and https://gerrit.opnfv.org/gerrit/#/c/47735/ are merged I can start moving pdf files into the pharos repo Once this is complete I can remove check-jinja2 job from securedlab. Eventually decommissioning the securedlab repo Change-Id: I623b7d8eb78438a8a24307ff0b3a1966c33cd7cf Signed-off-by: agardner <agardner@linuxfoundation.org>
2017-11-24Update git submodulesagardner1-0/+0
* Update docs/submodules/pharos from branch 'master' - Moving check-jinja2 to pharos. Securedlab will be going away now that we can encrypt strings (eyaml) we need to check jinja2 PDF templates that will be moving into pharos This adds one pod yaml files and fixes paths in check-jinja2.sh After this is merged I can create a jenkins job for pharos. Then I can start moving pdf files into the pharos repo Change-Id: I2f2f2925275de49035d7d0160249d75b25ca0d20 Signed-off-by: agardner <agardner@linuxfoundation.org>
2017-11-24Update git submodulesDelia Popescu1-0/+0
* Update docs/submodules/releng from branch 'master' - Fix Doctor run on 'doctor-{installer}-verify' slave Change-Id: I65a2a3c6643cba870eec2f794199bb824c6b868c Signed-off-by: Delia Popescu <delia.popescu@enea.com> Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-11-24Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'master' - Merge "[docs] Add MCP user guide" - [docs] Add MCP user guide Change-Id: I97a5a2817004850abc3f702004819a907472faf7 Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>
2017-11-24Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'master' - Merge "docs: Update prx nodes on network diagrams" - docs: Update prx nodes on network diagrams - prx: added 3rd interface, green dot to mgmt JIRA: FUEL-302 Change-Id: I9f807409ed7a84de95d7321f059343d5d676038e Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
2017-11-24Update git submodulesMarkos Chandras1-0/+0
* Update docs/submodules/releng-xci from branch 'master' - Merge "Add required packages install for AIO" - Add required packages install for AIO The All-in-One flavor is missing the tasks for the installation of distro and pip packages, these tasks are performed by other flavors. Change-Id: Ia0f707c08acd47e1dc4577916da58e338ba187fa Signed-off-by: Victor Morales <victor.morales@intel.com>
2017-11-24Update git submodulesMichael Polenchuk1-0/+0
* Update docs/submodules/fuel from branch 'master' - Switch nofeature-ha compute nodes to UCA repo Employ UCA repo on computes nodes for nosdn-nofeature-ha scenario as well to prevent a regression (creation of ports failed for 1+n instances) of neutron ovs agent from mcp/openstack repos. Change-Id: Ie65ae122096c0d3a93c09d46191787a934bd7d4f Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2017-11-24Update git submodulesRHE1-0/+0
* Update docs/submodules/moon from branch 'master' - remove keystone-moon Change-Id: I80d7c9b669f19d5f6607e162de8e0e55c2f80fdd Signed-off-by: RHE <rebirthmonkey@gmail.com>
2017-11-24Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/sfc from branch 'master' - Update CMD in gating Dockerfile It conforms with the change "Remove prepare_env" [1]. [1] https://gerrit.opnfv.org/gerrit/#/c/47267/ Change-Id: I9a80049e002b812d097067dc53798fa3bc532505 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2017-11-24Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Enable Doctor testcase for F-release doctor conforms with OpenStack Pike requirements then it could be enabled in functest-features and functest-restapi (master) [1]. [1] https://gerrit.opnfv.org/gerrit/#/c/47283/ Change-Id: I82135a64cf0aac5ebf5b56260ede24b592fca41b Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2017-11-24Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Enable baro_tests testcase for F-release barometer conforms with OpenStack Pike requirements then it could be enabled in functest-features and functest-restapi (master) [1]. [1] https://gerrit.opnfv.org/gerrit/#/c/47281/ Change-Id: Iee17bd17192db53075dd8ff8d020d18306394cfa Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2017-11-24Update git submodulesrpaik1-0/+0
* Update docs/submodules/parser from branch 'master' - Added a license metadata line to specify Apache-2.0 Change-Id: I567522d47fa30efa03e84e5292360481e81f30ad Signed-off-by: rpaik <rpaik@linuxfoundation.org>
2017-11-24Update git submodulesCedric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Merge "Remove iniparse and urllib3 dependencies" - Remove iniparse and urllib3 dependencies It also moves robotframework addons to the right containers. Change-Id: I32a8e018bf84685cffc70a04e3736d948bc6d1c4 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2017-11-24Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Fix relative imports in cloudify_ims_perf It also fixes wrong indents. JIRA: FUNCTEST-893 Change-Id: Ic54e01c03c14f39c69242c41922fc124c1b45c23 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2017-11-24Update git submoduleswenjuan dong1-0/+0
* Update docs/submodules/doctor from branch 'master' - Merge "Added instructions to enable Neutron 'Data Plane Status' ML2 extension" - Added instructions to enable Neutron 'Data Plane Status' ML2 extension Change-Id: Ief6fc069898e4bbf5a8ac48b0a42b80a3f541cbd Signed-off-by: Bertrand Souville <souville@docomolab-euro.com>
2017-11-24Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/doctor from branch 'master' - Updated from global requirements Change-Id: I892ae546490cac6e8a59c68bbf2dd214f8842597 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2017-11-24Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Switch ODL version to Carbon-SR1 SR2 seems has issues with FIP ping test Change-Id: I4aea097f2009c2c33de8fc85820bf68c1cbb316a Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-11-23Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/armband from branch 'master' - u/fuel: Bump & rebase for MaaS fabrics fix Change-Id: I58bacd2b8f9d210fd9e144cd8db6239ca0b8949d Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-11-23Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "jjb: xci: xci-verify-jobs: Enable tempest for XCI" - jjb: xci: xci-verify-jobs: Enable tempest for XCI Set RUN_TEMPEST=true so we can tempest when running XCI CI jobs. Change-Id: I3f7617e20dc4f4c1ba9a1e9016eef125c924e7b7 Signed-off-by: Markos Chandras <mchandras@suse.de>
2017-11-23Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Fix Couldn't find remote ref $GERRIT_REFSPEC" - Fix Couldn't find remote ref $GERRIT_REFSPEC JIRA: ARMBAND-305 Change-Id: Ic01d7d46375a27160e583e07ea96c60fa68f8c71 Signed-off-by: Delia Popescu <delia.popescu@enea.com>
2017-11-23Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'master' - salt.sh: Rework `git -C` for older git compat CentOS 7.4 provides git 1.8.3, while `git -C` support was introduced in 1.8.5, so rework <salt.sh> to not rely on this parameter. Change-Id: Ied88466b2b3d91a3317922fa08f60afe934358a0 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-11-23Update git submodulesMarkos Chandras1-0/+0
* Update docs/submodules/releng-xci from branch 'master' - Merge "Integrate inband os-nosdn-ovs scenario" - Integrate inband os-nosdn-ovs scenario Change-Id: I9253edf028fce571e04f9f82103a94952e05d2d4 Signed-off-by: Periyasamy Palanisamy <periyasamy.palanisamy@ericsson.com>
2017-11-23Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/barometer from branch 'master' - Updated from global requirements Change-Id: I948ca4fdd98755630de06ea0b32a759a79c1795c Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2017-11-23Update git submodulesMaryam Tahhan1-0/+0
* Update docs/submodules/barometer from branch 'master' - docs: add security information Change-Id: I014ee8bb762e1c2d9a94bc780816508133e2adf5 Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com> Signed-off-by: Emma Foley <emma.l.foley@intel.com>
2017-11-23Update git submodulesCedric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Merge "Remove openstack utils calls in rally and tempest" - Remove openstack utils calls in rally and tempest Mainly, update "rally deployment create --file=rally_conf.json" to "rally deployment create --fromenv" Change-Id: I6dd4c7ea2d9d6f47dee49a4fd416e62bd557f45e Signed-off-by: Linda Wang <wangwulin@huawei.com>
2017-11-23Update git submodulesJose Lausuch1-0/+0
* Update docs/submodules/functest from branch 'master' - Merge "Remove _set_others() from config" - Remove _set_others() from config Change-Id: I39e37ce9f8715e21fcfc4a053b83d508530fad5e Signed-off-by: Jose Lausuch <jalausuch@suse.com>
2017-11-23Update git submodulesMarkos Chandras1-0/+0
* Update docs/submodules/releng-xci from branch 'master' - Merge "xci: scripts: start-new-vm.sh: Rework fix for parallel pkg mgr instances" - xci: scripts: start-new-vm.sh: Rework fix for parallel pkg mgr instances The current way of detecting whether multiple package manager processes are running is not ideal so just wait a random amount of time if we detect that another instance of our package manager command is running. Change-Id: Id94e3ed5293bf223f7250f92525a6e02bb1ea842 Signed-off-by: Markos Chandras <mchandras@suse.de>
2017-11-23Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng-xci from branch 'master' - Enable tempest Change-Id: I0fb12e4c2612f953998880a94b13655fa9ee0d8c Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
2017-11-23Update git submodulesJose Lausuch1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "[Functest] Remove prepare_env from the docker cmds" - [Functest] Remove prepare_env from the docker cmds When [1] is merged, prepare_env won't exist and the call will fail. Keeps the former call until Euphrates jobs are stopped. [1] https://gerrit.opnfv.org/gerrit/#/c/47267/ Change-Id: Ia41906f9e8ee15409cb28bb9bb621a7ab1964eee Signed-off-by: Jose Lausuch <jalausuch@suse.com>
2017-11-23Update git submodulesLinda Wang1-0/+0
* Update docs/submodules/functest from branch 'master' - Merge "Fix how tier_handler is imported" - Fix how tier_handler is imported Change-Id: I36577ca73042b181b4634c4d6bf3ac5d905fd560 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2017-11-23Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng-xci from branch 'master' - Merge "Use RUN_TEMPEST global env" - Use RUN_TEMPEST global env The RUN_TEMPEST global environment has been defined in *user-vars* but never used in the playbooks. This change pretends to enable the use of that value. Change-Id: I49ca092546494c0cdcb015a549828bf79fa5f889 Signed-off-by: Victor Morales <victor.morales@intel.com>
2017-11-23Update git submodulesMarkos Chandras1-0/+0
* Update docs/submodules/releng-xci from branch 'master' - Merge "Add the libvirt DNS to resolv.conf" - Add the libvirt DNS to resolv.conf This change adds the gateway into the resolv.conf for helping to resolve some routes faster during the execution of start-new-vm.sh main script. Change-Id: I08f361f5e55589f388e6ff6613d213eb79bbbce9 Signed-off-by: Victor Morales <victor.morales@intel.com>
2017-11-23Update git submodulesCedric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Merge "Remove prepare_env" - Remove prepare_env After moving the rally installation out of prepare_env It doesn't much sense to keep this script as it doesn't do useful things any more. Change-Id: I9ab3b2dd30c8ec0fbb825ee4302a83cce80f1cbe Signed-off-by: Jose Lausuch <jalausuch@suse.com>
2017-11-23Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "Support the scenario for installing kubernetes in ubuntu system" - Support the scenario for installing kubernetes in ubuntu system JIRA: - Currently we only support the the scenario for installing kubernetes in centos system. This patch is to install kubernetes in ubuntu system Change-Id: Idc5eafea5d02c28c62a31e4c29451b8c5aaf1fd5 Signed-off-by: hu xinhui <xinhui_hu@foxmail.com>