aboutsummaryrefslogtreecommitdiffstats
path: root/upstream
AgeCommit message (Collapse)AuthorFilesLines
2016-06-08Updated armbandStefan Berg1-0/+0
Project: fuel 14f07bc7ecb9f166d5244abcc5789d8fd584c0dd ISO: Use --joliet-long names. Armband adds similar files, which tend to have long names and only differ in suffixes (e.g. DEBs for amd64 vs arm64). This works around ISO build error(s) like: "genisoimage: Error: ./ubuntu/pool/main/g/golang-gogoprotobuf/golang-gogoprotobuf\ -dev_0.0~git20150828.0.6cab0cc-1~u14.04+mos1_amd64.deb and ./ubuntu/pool/main/g/golang-gogoprotobuf/golang-gogoprotobuf\ -dev_0.0~git20150828.0.6cab0cc-1~u14.04+mos1_arm64.deb have the same Joliet name" Change-Id: I89d9816d86176d80bcc76f5f90c8391b0664ab82 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-06-08Updated armbandMichal Skalski1-0/+0
Project: fuel 6f9e8e2c829412d350644fa6a820a8a2890f69b7 Do not create files when check connectivity Change-Id: If0ab25ee843f9892510da3d3c8d1f10a54440545 Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-06-08Updated armbandStefan K. Berg1-0/+0
Project: fuel a87426e28f604517de39f778b7a216ecf75e172a Script to clean expired build cache items Change-Id: I5e466c89c05eb4d637778218cfe03b88d569f331 Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
2016-06-08Updated armbandPeter Barabas1-0/+0
Project: fuel 7b6a386fe58d96ff476cd8c34a18c6e7bce8895f Fix for not reaping 'ssh_network' Change-Id: Ib225701a808211e50554c8f1762325aa75ecc33f Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
2016-06-06Updated armbandMichal Skalski1-0/+0
Project: fuel c4afb1da513ef3230432fff400ea231660b230c9 Build odl plugin for mitaka Change-Id: I59b96a424a753f880b4ac16abd806851ad3f9533 Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-06-03Merge "Submodule(s) rebase on stable/mitaka."Alexandru Avadanii7-0/+0
2016-06-02Updated armbandPeter Barabas1-0/+0
Project: fuel 6c498c04a9843bcc99dc94650e5d0b31490dfa1b Download deployment config after modification Modified network or interface configurations were not reflected in the deployment config, resulting in faulty node configurations. Change-Id: I4ca20702c0171e7995f2b4f46317557ec9d5beac Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
2016-06-02Updated armbandStefan K. Berg1-0/+0
Project: fuel 2498bbb0354fd7abbbb408810f419c2999c23a31 Auto deploy corrections for Fuel 9.0 - The auto deployer's detection of nodes being up corrected as "fuel node" now returns "1" instead of "True" to denote that the node is up. - The location of bootstrap_admin_node.sh has changed so the detection of whether the Fuel node installation needed a correction for the deployer not to throw an exit code and terminate prematurely. - Small fix: deploy.py is now executable (just a chmod change). Change-Id: I8fed7bafe6912f8b4278619bbdaa16577a82737b Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
2016-06-01Updated armbandJonas Bjurel1-0/+0
Project: fuel 0ac1af6354f57c389b407cb1ea1e0365027704a6 docs: Mitaka Build req: Add p7zip-full. Build system uplift to Fuel 9.0/Mitaka now requires `7z` cmd utility also on the builder host (not only inside docker containers), so document this as a prereq in the build instructions. [1] https://gerrit.opnfv.org/gerrit/#/c/13919/ Change-Id: Icb57ac58c499272fce0a27bb2d25383e933c7814 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-06-01Submodule(s) rebase on stable/mitaka.Alexandru Avadanii7-0/+0
2016-06-01Updated armbandPeter Barabas1-0/+0
Project: fuel 74454885828f33629f0355616017b67768bc7bd8 Clean up after ourselves Change-Id: Id7579ef618b8cd922de325d9dc1c0b7a6c5587a7 Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
2016-06-01Updated armbandDaiel Smith1-0/+0
Project: fuel 1378a27086272efec083778dd52fb27511b88167 A small edit for the uplift to Mitaka from Liberty Signed-off-by: Daiel Smith <daniel.smith@ericsson.com> JIRA:0
2016-05-31Updated armbandJosep Puigdemont1-0/+0
Project: fuel 3b8db706acb60b680bcf220bd0236d5efcc66d07 common.py: catch stderr in exec_cmd When running commands with exec_cmd(), the stderr of the command is sent to /dev/null and ignored, and only stdout is retrieved. Thus, when a command fails and check is enabled, only the output of stdout is presented to the user, which normally holds no information about the error. In this patch we retrieve stderr, and when an error occurs, an exception is raised with that message. Fixes https://jira.opnfv.org/browse/FUEL-142 Change-Id: I3940e1a43963a6abec362481b1d4ce7bd7cb816d Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
2016-05-31Updated armbandStefan K. Berg1-0/+0
Project: fuel ec0c7698cd363b71694ca33e87f65fc382acda8d Build system uplift to Fuel 9.0/Mitaka Switching to Fuel 9.0/Mitaka for the build system. Overhaul of the patching mechanism. As bootstrap_admin_node.sh has been transitioned into an RPM (fuel-support), the lazy designer found it more simple to patch that script during the Fuel build phase than at the OPNFV ISO generation. The patch mechanism has been changed to a normal context diff instead of the orig/modified file tuples previously used. Hopefully this will require fewer manual rebases (may the fuzz be with us!). Also the ks.cfg patching has transitioned to a context based ordinary patch for the same reasons, but this is as before taking place during OPNFV ISO generation. Patch naming made more descriptive. The reaping mechanism has been slightly modified due to a change in the naming of the node files when these are generated by the Fuel CLI. IMPORTANT 1: The package cache mechanism is currently disabled, it is only possible to install Fuel with a direct internet connection. This will be fixed in a later change set! IMPORTANT 2: All plugins has been disabled! As you have re-certified your plugin with Fuel 9.0, please re-enable it in build/Makefile! Change-Id: Ia918d16a74b68f89d178e06befe6e8a7a9367bf9 Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
2016-05-30Updated armbandJonas Bjurel1-0/+0
Project: fuel ebb5b355ba542fc22b8f96f952439251d4b2c90b Remove residual Lab & configuration DEA and DHA from the unprotected Fuel repo This needs testing!!!! On a follow-up release, this also needs rebasement, the libvirt templates are still in here - they shouldnt, sinse we dont want Lab specific configs in the Fuel repo. NOT VERIFIED DO NOT MERGE Change-Id: I069ced81b886405463f27f37a6ec78e3748b37b7 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
2016-05-25Updated armbandJonas Bjurel1-0/+0
Project: fuel 370cf3546e2f5e3a7afa69b4f306bd7c90d44397 More rigorous Fuel environment check get_env() used to raise an unhandled exception when reap.py was run on a Fuel node which didn't yet have an environment set up. Change-Id: I07c37db2d80e416d26fa4fb4907f4e438f1c44e5 Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
2016-05-24Updated armbandJonas Bjurel1-0/+0
Project: fuel b0b2e869cae884aaed305f2984701dc813a469ec docs/install-instr: Add target specific cfg sect. Fuel 8.0 adds support for setting up "Offloading Modes" for target nodes. Document how this features should be used (and why/when it's necessary), and also its common limitation of not being applied during Verify Networks step (see related Fuel bug report [1]). While at it, fix minor reference to branch in git tag checkout instructions, as we'd be in detached HEAD and not on a new branch. [1] https://jira.opnfv.org/browse/FUEL-134 [Alexandru.Avadanii@enea.com] Only minor edits and prepared for upstreaming, this is mostly based on previous work from Florin. Change-Id: If7a8ca44541903dbeb6db36bc64fe56b132165cb Signed-off-by: Florin Dumitrascu <florin.dumitrascu@enea.com> Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-05-19Updated armbandManuel Buil1-0/+0
Project: fuel 439f684991c36f61483b12134a8c981f78f0e473 Remove coexistence configuration from post script This is not more needed as the config comes from FUEL ODL plug-in Change-Id: Ie09a52ac3919ac641924d41431dc000910e6d4f4 Signed-off-by: Manuel Buil <manuel.buil@ericsson.com>
2016-05-13Colorado: Rebase git submodules on stable/mitaka.Alexandru Avadanii9-0/+0
Since fuel-plugin-opendaylight and fuel are OPNFV components, they do not have a stable/mitaka branch, so use master for them. Change-Id: Ie8ae0e458953bae7006e0d411b4680f20b87a13c Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-05-10Increase maximum shell command timeout to 2hStanislaw Kardach1-0/+0
Since `execute_shell_command` mcagent is used for building the target image and the timeout provided in the astute task is just respected on the Astute level (on mcollective level this timeout is actually a minumum between value provided and ddl value) we need to increase it for Armband operation. Because Armband builds the target image via `qemu-debootstrap`, it can take more than 1 hour to finish the building. Therefore aside of increasing the timeout in the Astute task, the maximum timeout value for mcagent has to be increased. Change-Id: Iab94e794e36bb7e887e8f334daa46e82fe0c6f94 Signed-off-by: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
2016-04-29Cleanup: Kill submodule: fuel-plugin-ovsnfv.Alexandru Avadanii1-0/+0
Change-Id: If1895891c28b7d8d8d109539357475ac578bfc38 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-04-29Cleanup: Kill submodule: fuel-plugin-qemu.Alexandru Avadanii1-0/+0
Since we only build ODL plugin on arm64 for now, kill fuel-plugin-qemu submodule in armband repo. Change-Id: Ib7a6dfe7e1dbd03771e3f28d2769d54659280901 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-04-27Updated armbandJonas Bjurel1-0/+0
Project: fuel 3e535448fe1bad43d810d9b2ccf66f13bb7c10e5 Updated documentation for Brahmaputra 3.0 follow-up release READY TO MERGE Change-Id: Ic481f02375af9be1642791fa6d96856a453c4f29 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com> (cherry picked from commit f50747c9ec79b9f89df6a6ba6d680a89bd6a3de3)
2016-04-26Updated armbandJonas Bjurel1-0/+0
Project: fuel 6a42aafa48d339ba3164bd03006a5cf128b55299 Using VLAN segmentation for the NFV-OVS scenarios. Unfortunately this scenario is hardwired to work with Ericsson POD-2 only Change-Id: I3a0b56d7ff71e0ec9cd97b8ef5946fb438d43e62 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com> (cherry picked from commit 12c2d3403c4638672bbf1443142b8308e828e5f4)
2016-04-26Updated armbandStefan K. Berg1-0/+0
Project: fuel f544e413ecbbaa25d36f2336bb703565afc8fb38 Correction due to changed cpio behavior As part of a security fix for cpio, its behavior has changed in terms of how symlinks are handled. This is affecting the Fuel build process, for which this commit is a fix (reverting cpio back to its original behavior by adding the argument "--extract-over-symlinks" in those instances where this is needed). For details, see https://jira.opnfv.org/browse/FUEL-125 Change-Id: I455b11a16ad52d8dd09165165447e4c4a661b45a Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com> (cherry picked from commit 2b419db5c9325c6a87f1ea160c42235a1e8ec083)
2016-04-17fuel-nailgun-agent: ohai: Read L1 info w/ ethtool.Alexandru Avadanii1-0/+0
fuel-nailgun-agent uses ohai and rethtool for reading eth info, including ethernet card speed. However, current methods rely on the drivers populating the advertised and/or supported link speed lists. This is not true for all drivers, especially for some Fibers that only report the speed via ethtool when the link is up. This patch adds support for reading L1 info from ohai, which supports parsing ethtool speed starting with version amos2 [1]. [1] https://linux.enea.com/mos-repos/ubuntu/8.0/pool/main/o/ ohai/ohai_6.14.0-2~u14.04+mos1+mos8.0+amos2_all.deb Change-Id: Ic8c252e411a680af32cc68574c572434147a7e78
2016-04-15Updated armbandBilly O'Mahony1-0/+0
Project: ovsnfv 8a312b9535b2f3fe721139ed37722a13d1a940b1 fuel plugin: Pick updated libudev1 packages. Package versions of libudev1 packages were bumped from 5ubuntu20.18 to 5ubuntu20.19. Change-Id: I628b56c1f057699d6ce4021a3a7ae125f759d5ac Signed-off-by: Billy O'Mahony <billy.o.mahony@intel.com> Reviewed-by: Jonas Bjurel <jonas.bjurel@ericsson.com> Reviewed-by: Mark D. Gray <mark.d.gray@intel.com> Reviewed-by: Tom Herbert <therbert@redhat.com> (cherry picked from commit fe0d98cb53b7ce4b116c0f557376afe326698226)
2016-04-15Updated armbandBilly O'Mahony1-0/+0
Project: ovsnfv 0b811a3af8585e229be85f2f6be7b5c36dbbc26a fuel plugin: Provide required libudev1 version The latest fuel .iso has changed provided libudev1 version from 20.18 to 20.15. As the later version is required for the plugin we now provide it directly in the plugin's repo. Change-Id: Ida93a9971185d13aa476a6192bca949b854f42af Signed-off-by: Billy O'Mahony <billy.o.mahony@intel.com> Reviewed-by: Jonas Bjurel <jonas.bjurel@ericsson.com> Reviewed-by: Mark D. Gray <mark.d.gray@intel.com> Reviewed-by: Tom Herbert <therbert@redhat.com> Reviewed-by: Michal Skalski <mskalski@mirantis.com> Reviewed-by: Stefan Berg <stefan.k.berg@ericsson.com> (cherry picked from commit 5181fb94a7485af207c1232753eeb74fb8975b1a)
2016-04-15Updated armbandNikolas Hermanns1-0/+0
Project: fuel c6e6a032ce80f6b8a781383ebe72f3ca9572b268 [VPNSERVICE] Bugfix Broadcast Group The local broadcast group was not updated correctly in ODL. This commit includes the bugfix. Change-Id: I7857bcdc543217d513683bf91ab13fa93ba2ed42
2016-04-14Updated armbandNikolas Hermanns1-0/+0
Project: fuel 8ac63ae166d30c1bec46b5159b2d2362be5b325f Adding patch for Broadcast Storm of vpnservice There is no persisten release from stable/beryllium with the bugfix https://git.opendaylight.org/gerrit/#/c/37566/ included. So we have to overwrite the file we a own build. Change-Id: I637c333fa2175544f182cd1f7b774501d3fc2c25
2016-04-14Updated armbandMichal Skalski1-0/+0
Project: fuel e70b1575651518c6d3d247b59c303e54c9d586ec Fix odl haproxy configuration In rare cases ODL haproxy configuration had been deployed before haproxy service was ready. This patch should force proper order. Change-Id: I7c90a57bab5e3388bf29aefabe6ed9380d1303f6 Signed-off-by: Michal Skalski <mskalski@mirantis.com> (cherry picked from commit a71ccaa852a7a0091fce50045f29ab5119a7811b)
2016-04-13Updated armbandBilly O'Mahony1-0/+0
Project: ovsnfv 6795067e538388078afc8b1f71b6e8224339da81 fuel plugin: Pick updated libudev packages. Package versions of libudev-dev_204 packages were bumped from 5ubuntu20.18 to 5ubuntu20.19. Change-Id: Ie43635c1ab3180a307475e0b47b082fe1cad6ae1 Signed-off-by: Billy O'Mahony <billy.o.mahony@intel.com> Reviewed-by: Jonas Bjurel <jonas.bjurel@ericsson.com> Reviewed-by: Mark D. Gray <mark.d.gray@intel.com> Reviewed-by: Tom Herbert <therbert@redhat.com> Reviewed-by: Michal Skalski <mskalski@mirantis.com> (cherry picked from commit a1f15bb1c833079d49affab36bb4bb20ca73dafd)
2016-04-11Updated armbandNikolas Hermanns1-0/+0
Project: fuel 6597153801bc56a8d273ebd38b6cace45b5f3c4a Redo config of plugin build - Split up config into a new config file - add revision to better point to a branch instrad of a revision. Change-Id: I341138973b56fb0807478ee08cab039ab31d6503
2016-04-11Updated armbandBilly O'Mahony1-0/+0
Project: ovsnfv 456f72770de91a7489962d962efc823d3d5ceec8 fuel plugin: Pick updated pcre packages. Package versions of pcre 8.31 packages were bumped from 2ubuntu2.1 to 2ubuntu2.2. Change-Id: I5a48af87ff36375f41f2bb12b20c4c4d272d00c6 Signed-off-by: Billy O'Mahony <billy.o.mahony@intel.com> Reviewed-by: Jonas Bjurel <jonas.bjurel@ericsson.com> Reviewed-by: Mark D. Gray <mark.d.gray@intel.com> Reviewed-by: Tom Herbert <therbert@redhat.com> Reviewed-by: Michal Skalski <mskalski@mirantis.com> (cherry picked from commit 37c978c1fa84cd20f449aa1de7a74024cc9a8d13)
2016-04-11Updated armbandBilly O'Mahony1-0/+0
Project: ovsnfv 9be3edaf948cc28c6e879fa71daf4927dd3ed0d4 fuel plugin: Fix mechanism driver config This fixes the yardstick ping test. And hopefully other y/s tests. Add ovs to the mechanism driver search list so that neutron agent continues to work with the kernel ovs on the non-compute nodes. This enables the router on the control node and makes VMs accessible via public ip addresses. Change-Id: Ife08e63e8bf9358cc24eb610b3d7611484b3151f Signed-off-by: Billy O'Mahony <billy.o.mahony@intel.com> Reviewed-by: Jonas Bjurel <jonas.bjurel@ericsson.com> Reviewed-by: Mark D. Gray <mark.d.gray@intel.com> Reviewed-by: Tom Herbert <therbert@redhat.com> Reviewed-by: Michal Skalski <mskalski@mirantis.com> Reviewed-by: Stefan Berg <stefan.k.berg@ericsson.com> (cherry picked from commit b5b4ea732e18c5450c663c6f84f289eb6acadf4b)
2016-04-10Updated armbandPeter Barabas1-0/+0
Project: fuel a2bd1d8baa9d2c256671834fc90a1c7e489850d7
2016-04-10Updated armbanddavidjchou1-0/+0
Project: fuel cc51d7477901e5acf27e3599754f6a751231a2f1
2016-04-09Updated armbandNikolas Hermanns1-0/+0
Project: fuel e8d3f97a5fa317edc6aefb091da5318d946e82ce
2016-04-09Updated armbandJonas Bjurel1-0/+0
Project: fuel 5033efb4cbb8fb2b932846e5ac900c2ad042e28d Get user id without forking a shell. Change-Id: I6789b81186b7ede124a838a5b6668ba8326e0c0b Signed-off-by: Peter Barabas <peter.barabas@ericsson.com> (cherry picked from commit befc84a9d28663a45510c71119980e1cf5b6eeca)
2016-04-09Updated armbandJonas Bjurel1-0/+0
Project: fuel 28d95448184d16767aebedb6689d2c3059b559aa Tell debconf not to be interactive Change-Id: If3d937ba895cb06834a9f8b7382d1033aac9714f Signed-off-by: Peter Barabas <peter.barabas@ericsson.com> (cherry picked from commit 9d52d96263d9dc27183abd9a39d36bb7174efef4)
2016-04-09Updated armbandJonas Bjurel1-0/+0
Project: fuel 4fb3f2ed2549ab47a0048d88cbd1303de46820a1 Fix deploy.py return code Fixes https://jira.opnfv.org/browse/FUEL-100 Change-Id: Ic2e01372778720cde84d83738d8b2c85b005124a Signed-off-by: Peter Barabas <peter.barabas@ericsson.com> (cherry picked from commit 50862693f7c1119c941bc344c90d91cdd37dde38)
2016-04-09Updated armbandJonas Bjurel1-0/+0
Project: fuel f3f8da1bb11e4b91c7b7ee8b7d289c83a6bcfa45 Changing raw to qcow2 for vFuel/Controller/Compute A lot of diskspace is allocated although never used this commit changes to thin provisioning for the virtual enviroment. Change-Id: Ia128143a3bae9f3d85a9e749319c2f5343c1df4e (cherry picked from commit aac8573f454109c98fa2af1e5ed05c1d1b19829b)
2016-04-09Updated armbandNikolas Hermanns1-0/+0
Project: fuel 83ba58f31888144bb34a9d844454093d75469548 Remove apparmor for vFuel Not every CPU supports apparmor and there is no real benefit when using it only for fuel. Change-Id: Ibb3221b85d8565f718df9b087aa324d0f606bdee (cherry picked from commit ca27087edd27555aa6d7992b3e754c970bc6543f)
2016-04-08Updated armbandPeter Barabas1-0/+0
Project: fuel 0dc771a9584fe1998236c8941189b1afc3c3c066 Remove duplicate import of hashlib Change-Id: I306b8260ea37fb32ef8db8cf5d4628b50328027f Signed-off-by: Peter Barabas <peter.barabas@ericsson.com> (cherry picked from commit 18171a86a7d2b5cda035281ed0fdd3dcb8fbad36)
2016-04-08Updated armbandJonas Bjurel1-0/+0
Project: fuel 5e341a6f501e408dfd4c0dce401a6587ec6d5277 Cleanup and add bgpvpn to scenario file Change-Id: I82ce16751b4d52d6fdb39883b730073164f9dfe0
2016-04-08Updated armbandJonas Bjurel1-0/+0
Project: fuel 080b202e25964768f58825950bc779fe7d39002f Fix wrong indentation Change-Id: I215da0a101d94e2c3fd4aeea80b98f7c9aefe0fb Signed-off-by: Peter Barabas <peter.barabas@ericsson.com> (cherry picked from commit 8e91da9cbbb698e7f8531973299f81411a2532d2)
2016-04-07Updated armbandDaniel Smith1-0/+0
Project: fuel 702e61f5d7ef392c1b91b474f025303aad04d9b3 Enable BGPVPN_extension/SDNVPN_feature This commit includes the bugfixes and changes for BGPVPN_extensions and SDNVPN_feature of ODL. Change-Id: I9832680109edae497f7a344d5626568d3a335a15 (cherry picked from commit 2bebed7722fe1311cd1bc4199368db16dfad9a26)
2016-04-07Updated armbandNikolas Hermanns1-0/+0
Project: fuel 1df185cb53f65f867786b4b80bd18e0a28e87c69 Uplift fuel-plugin-bgpvpn repo Change-Id: I8d888628f66e1661486eb6ef79240a61da83a211
2016-04-06Updated armbandJonas Bjurel1-0/+0
Project: fuel 4414d39225fa7ea386d86ea36abe67e6bed12c01 Use Opendaylight_SR-1 In order to use the lates ODL build also the fuel-plugin-opendaylight is uplifted. Change-Id: Ic38d46818110c2b62920f2146cd406705d8e3673 (cherry picked from commit a1cdb3c2bd9a0a9d6a0d26c3709052be6f190e42)
2016-04-06Updated armbandNikolas Hermanns1-0/+0
Project: fuel e7a78baae49f02b4303b6204eea7de01c527744c Enable merge of the versions struct of a plugin Redoing this the reverted patch. The original idea that everyone which wants to merge lists has to code that, is not wanted. So the Exception will become a warning. This reverts commit 552536f5319d6ead73118d0cfd701d648e99df28. Change-Id: Ib15541199054da27c1a2aec68b5c1436da9622c9 (cherry picked from commit fb238de7c9833e91771ee4448f425f45168f8e6e)