Age | Commit message (Collapse) | Author | Files | Lines |
|
Document workaround for xtrabackup issues on AArch64 controllers.
Change-Id: I126c730f751f09a4d75ac345d9b889df9414de2d
(cherry picked from commit 01de958da6b989712df8e3fe092845b043ab4215)
|
|
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).
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.
Change-Id: If7a8ca44541903dbeb6db36bc64fe56b132165cb
(cherry picked from commit 3cb6402c59bbf72099e63fd3f26017089520841e)
|
|
Change-Id: I04b97451d9b411d727b0ef51f1fc329510a286bb
(cherry picked from commit d4e37c21c5c76f52474d44e9cc32961259fb79ab)
|
|
Change-Id: I0ce904da2f18e1d5e032181dbcd0d7b35aabfdff
(cherry picked from commit b205132a3c42c8764c574a90116f871e390cff8f)
|
|
Drop unnecessary <user>@, not needed for http downloads.
Also, fix typo (missing letter) in opnfv.org domain name.
While we're at it, fix small typo in Ceilometer name too.
Change-Id: I58fa3a3f7f4a216b00d39174aae98da9328418d6
(cherry picked from commit dd00dfab0a3851830115b8e5d1f21343b506192d)
|
|
|
|
|
|
Doc build fails to create a link for www.opnfv.org because it
does not explicitly specify the protocol handler.
Make doc build happy by adding "http://" prefix.
Change-Id: I7dc9c362f13bac1687d139942826eb1208556a37
(cherry picked from commit 45d98b23ba426c5caa7c2ea154eeccecb8e44291)
|
|
We do not have a comprehensive public hardware compatibility list
for AArch64 hardware yet, so silently remove the link to such a
thing in the installer instructions for now.
Once the page is in place, update the reference and revert this
commit.
(cherry picked from commit ba8cd7a10d52cf9c1270be0c7096e13a192e8b50)
Change-Id: Ibdec1f7925fe90ae0ae4eb904637fe764d4b5c86
|
|
Previously, build instructions and release notes kept links to
x86_64 documentation, it is now safe to drop them, as our docs
are very similar.
(cherry picked from commit 268b6f4310f611a329f24bb61d16f5731bc122c4)
Change-Id: I19df5f7fb82e23cb881e9702cd29d51ecbc65446
|
|
Read both TARGET_LAB and TARGET_POD from the command line parameters
passed to Fuel's build script. We need these to find local_env.
Change-Id: I288dedeb75001b0983e63e68e993b2a35fd6f6fc
Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
(cherry picked from commit 8f1a15e2423d72f65d00fa4b853ee3239b0780da)
|
|
|
|
stable/brahmaputra
|
|
Signed-off-by: Florin Dumitrascu <florin.dumitrascu@enea.com>
(cherry picked from commit 77e03df9034abd030b97270ea4dbdea1784bc9e2)
Change-Id: Id6dfd7881a2aa4ac1abdef3fb1f61bf411b22c44
|
|
Add missing bash (console) code-block tags to commands and preformatted
output / configuration sections.
While we're at it, fix git clone URL for https, and clarify a few
paragraphs.
Change-Id: Ifb1ef0a8a9befa57e68255354957e094a124ab7e
(cherry picked from commit 6c90cb7ead70605a3daf5df6a37357b01f17d3b2)
|
|
While doing minor reworking, also change submodule add intstr from
ssh to https URLs, so simply building this does not require a github
account to be locally configured.
Change-Id: I915e9cdbbe0185e5d637bf9ddad96d92f94c0b01
(cherry picked from commit a0e1b11e7dccbc59c5664e59a70abebdebadd8ae)
|
|
|
|
|
|
While we're at it, fix default setting for net.ifnames in arm64
fixture.
Also, renumber some patches to eliminate duplicate prefixes
resulted from parallel development of patch sets.
Change-Id: Ibd8cc1f6f8916ad79527f2060a1a2725d557b2c2
(cherry picked from commit 93f6b4a3da5772c0a1d3d0d13f4ea5e024985488)
|
|
Previously, rtc-efi module was blacklisted in fuel-library preseed
cobbler template, which is not used for Ubuntu target nodes.
Fix by instead blacklisting rtc-efi in cloud-init jinja2 template.
Change-Id: I325f8d1f411f51d494df7c738f1933445d996ff6
(cherry picked from commit c73afc11396a8a11d14f2fb74ad616297a90fa1d)
|
|
Change-Id: I92b2024df53c392eaeea6a76c9d44b94b83b7f56
(cherry picked from commit 7f93a8cf5b97a4e9b606930ab1c15b42ff580a32)
|
|
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>
(cherry picked from commit 5677e66fc3df2ceb0a9557e60f6931851b213fd9)
|
|
Since on AArch64, Ubuntu local mirror lacks arm64 packages (see [1]),
Fuel master requires internet connectivity during deploy, and hence
a way to setup such a public (extra) interface automatically.
Previous commit "transplant: Generate extra interfaces config file"
introduced support for passing this information via DEA (override),
which may define a IFCGF_<interface> section in its 'fuel:'
section, containing the necessary keys to produce a ifcfg-<interface>
file, like in this example:
fuel:
IFCFG_ETH1:
device: eth1
ipaddress: 10.0.1.10
netmask: 255.255.255.0
gateway: 10.0.1.254
In order for Network Manager to use the newly added interfaces
for outgoing traffic and honor their GATEWAY setting (e.g. if we just
added one public interface), the default route on admin iface (most of
the time called eth0) is disabled when extra interfaces are present.
FIXME: Only supports lowercase interface names, but so does Fuel,
see related bug report [2].
[1] https://jira.opnfv.org/browse/ARMBAND-35
[2] https://jira.opnfv.org/browse/FUEL-136
Change-Id: Idd6fe95a5a73ec172eca17cfd96f23b1a1bc2bee
Signed-off-by: Alexandu Avadanii <alexandru.avadanii@enea.com>
Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
(cherry picked from commit 129e0808397100818df506d854d1b8186a023019)
|
|
While building for a different architecture (e.g. AArch64 on x86_64),
the bootstrap/target image build may take longer, due to latency
introduced by using qemu-user-static.
Change-Id: I2b57aae73ccc172fea9e53867bcb66e2f950498f
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 8b601647ac2b5910e869de444d6942be7d89f610)
|
|
Some PODs might need to increase the default timeout value.
The patch introduces the -T flag to Fuel's deploy script, that
can be used to set the timeout. If the flag is not given, it
will look into the DEPLOY_TIMEOUT environment variable and use
that value instead, otherwise the default vaule in deploy.py
will be used.
Change-Id: I835473190673dd8646d0da48c2dbd3bb5e13046d
Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
(cherry picked from commit 8a6c5f736ab571796549ad7369a9dbfd6680cfef)
|
|
|
|
Updated release notes document and created JIRA cases for AArch64
newly added features, bug, workarounds etc.
Change-Id: I1db230a9fa62e671f4f302c8f7b202cc5c8f48ca
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit a6ab68aa2a3f5e3d52ad22e37783d334555f84fc)
|
|
OPNFV ISO build uses fuel-mirror to create a local Ubuntu
partial mirror in nailgun.
Work around temporary mirror issue (e.g. during rsync) by
retrying mirror build up to 10 times.
Change-Id: I8afb0f55b08c1680903a09e07ac96b4d29415ed5
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 5837be3b12a39bbf85f267182618fd28f8b2529e)
|
|
|
|
stable/brahmaputra
|
|
Change-Id: Ic355364e5fb4215f1ad10f8f961978fa0b071762
Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
(cherry picked from commit ca213fa7036802c695f287615ae1dd0bc98edf1e)
|
|
Change-Id: I2b94d6fcb20c59d9d776c04561665108e1f035ca
Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
(cherry picked from commit bf9b024d1e6b782d0958487a497d60bf18dee51e)
|
|
These are a collection of patches that adapt the current Fuel deploy
scripts for mainly two purposes:
- Make it possible to create a Fuel VM on a remote libvirt server.
We use the LIBVIRT_DEFAULT_URI environment variable to detect that.
Local deploys are possible by setting this variable to
'quemu:///system', or leaving it empty.
See: https://libvirt.org/remote.html for more details.
- Make it possible to add additional network interfaces. For this we
allow the user to pass the "-b bridge" paramter several times, and
creating a new virtual NIC for each of them, in the same order they
were given.
This required a bit of refactoring of the code.
None of the changes above should break backwards compatibility, except
when indicated in the commit (search for CHANGE in the log)
In addition there are some updates to the code that were deemed
necessary, like the ability to retry when executing shell commands
instead of directly failing, and a simplification of the DHA IPMI
adapter.
Change-Id: I8a0cd5b8672383decd861309328137971eaed14b
Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
(cherry picked from commit bedeb36ac9ad42fb1ead2449ed8e75f0171808a2)
|
|
Change-Id: If1895891c28b7d8d8d109539357475ac578bfc38
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Conflicts:
upstream/fuel-plugin-ovsnfv
|
|
Project: fuel 3e535448fe1bad43d810d9b2ccf66f13bb7c10e5
Fix KVM launch issue
Signed-off-by: Ruijing Guo <ruijing.guo@intel.com>
(cherry picked from commit 82df2b11d7e1b8fc4b6a09707bc8739f43ec32f3)
Updated armband
Project: fuel 9b6f48f96e820e8d483a5e450160709d40001aa7
Storage fix for the KVM scenario
- Ceph is used with a replication factor of 1
- In no-ha, a separate node is used for ceph-osd
- In ha, one of the controllers is used for ceph-osd
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
(cherry picked from commit 2d3ddaf5083d1bb0d92334fce1cd79b128eed944)
Updated armband
Project: fuel f3ba9428eef07e4fc16733a9d0242080f3e38858
Update to current version of Fuel repos
Version stepped the fuel-library and fuel-web repositories to what's current
as of today.
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Updated armband
Project: fuel 7850796e82bcdef27b0555171f7faf14e9ae99ea
Fix KVM/QEMU plugin bug
1. fix nested virtualiztion in realtime kvm
Signed-off-by: davidjchou <david.j.chou@intel.com>
(cherry picked from commit 82c42d839a80bf69b502b8189edd520be1650f78)
Updated armband
Project: fuel f455b4cd1870a97c599fa4aba5c9934e5b2c4574
[BGPVPN] Correct BGPVPN plugin file
The plugin config 0.0.2 has some
missleading statements. At some point
in time we should delete it and
only use this one here.
(cherry picked from commit 9cd38d96acee7e165faca1724f586e568498da7b)
Updated armband
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.
(cherry picked from commit fb238de7c9833e91771ee4448f425f45168f8e6e)
Updated armband
Project: fuel 4414d39225fa7ea386d86ea36abe67e6bed12c01
Use Opendaylight_SR-1
In order to use the lates ODL build also the
fuel-plugin-opendaylight is uplifted.
(cherry picked from commit a1cdb3c2bd9a0a9d6a0d26c3709052be6f190e42)
Updated armband
Project: fuel 1df185cb53f65f867786b4b80bd18e0a28e87c69
Uplift fuel-plugin-bgpvpn repo
Updated armband
Project: fuel 702e61f5d7ef392c1b91b474f025303aad04d9b3
Enable BGPVPN_extension/SDNVPN_feature
This commit includes the bugfixes and changes
for BGPVPN_extensions and SDNVPN_feature of ODL.
(cherry picked from commit 2bebed7722fe1311cd1bc4199368db16dfad9a26)
Updated armband
Project: fuel 080b202e25964768f58825950bc779fe7d39002f
Fix wrong indentation
Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
(cherry picked from commit 8e91da9cbbb698e7f8531973299f81411a2532d2)
Updated armband
Project: fuel 5e341a6f501e408dfd4c0dce401a6587ec6d5277
Cleanup and add bgpvpn to scenario file
Updated armband
Project: fuel 0dc771a9584fe1998236c8941189b1afc3c3c066
Remove duplicate import of hashlib
Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
(cherry picked from commit 18171a86a7d2b5cda035281ed0fdd3dcb8fbad36)
Updated armband
Project: fuel 83ba58f31888144bb34a9d844454093d75469548
Remove apparmor for vFuel
Not every CPU supports apparmor and
there is no real benefit when using it
only for fuel.
(cherry picked from commit ca27087edd27555aa6d7992b3e754c970bc6543f)
Updated armband
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.
(cherry picked from commit aac8573f454109c98fa2af1e5ed05c1d1b19829b)
Updated armband
Project: fuel 4fb3f2ed2549ab47a0048d88cbd1303de46820a1
Fix deploy.py return code
Fixes https://jira.opnfv.org/browse/FUEL-100
Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
(cherry picked from commit 50862693f7c1119c941bc344c90d91cdd37dde38)
Updated armband
Project: fuel 28d95448184d16767aebedb6689d2c3059b559aa
Tell debconf not to be interactive
Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
(cherry picked from commit 9d52d96263d9dc27183abd9a39d36bb7174efef4)
Updated armband
Project: fuel 5033efb4cbb8fb2b932846e5ac900c2ad042e28d
Get user id without forking a shell.
Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
(cherry picked from commit befc84a9d28663a45510c71119980e1cf5b6eeca)
Updated armband
Project: fuel e8d3f97a5fa317edc6aefb091da5318d946e82ce
Updated armband
Project: fuel cc51d7477901e5acf27e3599754f6a751231a2f1
Updated armband
Project: fuel a2bd1d8baa9d2c256671834fc90a1c7e489850d7
Updated armband
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.
Updated armband
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.
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
(cherry picked from commit a71ccaa852a7a0091fce50045f29ab5119a7811b)
Updated armband
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.
Updated armband
Project: fuel c6e6a032ce80f6b8a781383ebe72f3ca9572b268
[VPNSERVICE] Bugfix Broadcast Group
The local broadcast group was not updated
correctly in ODL. This commit includes the
bugfix.
Updated armband
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
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
(cherry picked from commit 2b419db5c9325c6a87f1ea160c42235a1e8ec083)
Updated armband
Project: fuel 6a42aafa48d339ba3164bd03006a5cf128b55299
Using VLAN segmentation for the NFV-OVS scenarios.
Unfortunately this scenario is hardwired to work with Ericsson POD-2 only
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
(cherry picked from commit 12c2d3403c4638672bbf1443142b8308e828e5f4)
Updated armband
Project: fuel 3e535448fe1bad43d810d9b2ccf66f13bb7c10e5
Updated documentation for Brahmaputra 3.0 follow-up release
READY TO MERGE
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
(cherry picked from commit f50747c9ec79b9f89df6a6ba6d680a89bd6a3de3)
Change-Id: I5cebb718b88aa369876ab9e8e7f00e5309f04cee
|
|
Change-Id: Ia4123727913aa401d26cbe1028f30b20b4497961
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 523f0f6e0522e41815d8b77a00799a17fde3d72b)
|
|
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>
(cherry picked from commit c25ef1bb7537eef4df3169b603b087c6de126bef)
|
|
READY TO MERGE
Change-Id: Ic481f02375af9be1642791fa6d96856a453c4f29
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
(cherry picked from commit f50747c9ec79b9f89df6a6ba6d680a89bd6a3de3)
(cherry picked from commit 633f05d11bae8ef429288ad105d9a15aabc10c3b)
|
|
Commit 69fd98a broke the cobbler yum config, because instead of
re-adding only mos and nailgun repos with file:/// handler, it
kept the docker-specific repo config from ISO build.
Change-Id: I910fe639116a7ea8cb768c0371af0a84b471d0a4
(cherry picked from commit 81f99dfc384cb841617ed49d2b96ef8667be1982)
|
|
cobbler-grub-aarch64 (arm64 specific loader) is currently
distributed and added to the cobbler docker container during
ISO build using EXTRA_RPM_REPOS envvar mechanism.
However, since this package installs files in a mounted location,
its contents are not persistent, requiring a test and eventual
forced reinstall during container start.
This, of course, requires the package to be available at that point,
which is not currently possible, as we remove the extra RPM repository
entry from yum config at the end of container build.
Hacky temporary workaround:
Keep extra RPM yum config after container is set up, only for cobbler.
TODO: This patch should be dropped once cobbler-grub-aarch64 RPM
package gets upstreamed.
Change-Id: I58e39df2671d79125c68a5ec994db962c103ce01
(cherry picked from commit 69fd98ae01038e2eb130d55f1f90719d5bc30c67)
|
|
Change-Id: Ib59d82067d028a2c946a87747a6975749c85133b
Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
(cherry picked from commit 3b174977cbb4bf7a3a734912748204ca923bcc19)
|
|
rx-vlan-filter should be documented as a limitation in the current
release, and work for supporting it in bootstrap would not be
justified.
ThunderX network card speed is now parsed from ethtool output via
nailgun-agent and ohai.
Change-Id: If90e48eaf3665c570cd2999e8b6b1775e319bff7
(cherry picked from commit 058161ede98880ee6071a7bf38532846db29ef76)
|
|
This is now covered by Jenkins for automatic builds, and not
relevant for manual builds.
Change-Id: I539a7311fa9689405acdfcd05773fd5aaa81fbb0
(cherry picked from commit f4cf022ab567ce7f341ed5ef8c6b33f7d48d6963)
|
|
We previously added support for needed RPMs missing from Fuel repos,
by introducing an additional "armband" repository, then ammending
OPNFV ks.cfg{,.orig}; it's time to remove RPM mirror override
LATEST_MIRROR_ID_URL.
Since LATEST_MIRROR_ID_URL is common for mos CentOS and Ubuntu repos,
fill in MIRROR_MOS_UBUNTU instead.
Change-Id: I137ba588f8c3be3339a4b8affb4f84dc5ac9acc8
(cherry picked from commit e37d8766bf5429e4664b82c67e2575d48a3c738c)
|
|
This uses the public Ubuntu archive, which is not only slow,
but oftenly times out.
With the risk of using slightly lagging local mirrors, remove
public archive hard code.
End-users should configure this based on their location/mirrors
if necessary (e.g. out of date closest mirrors).
Change-Id: I3d963d202033b2b75dab3b8f10ee31e5a6940994
(cherry picked from commit 946b3dbbf2bf8022924cdd008587dfe7fc1e9a47)
|
|
Currently, Ubuntu Trusty provides a broken python-debian package,
that fails to parse foreign architecture (package:any) relationships.
Purge debian package and let pip resolve this dependency, using a
newer version from pypi.
[1] http://lists.alioth.debian.org/pipermail/
pkg-python-debian-maint/2014-July/001795.html
Change-Id: Iba8f6cb52ad0a92e5d8d2bee4fb066b213991a94
(cherry picked from commit ea5e41035b621520b805f5c50bb5153a76ff0800)
|
|
Drop p/fuel-main/0003-Make-cpio-accept-symlinks.patch,
since this is now covered by OPNFV commit f544e41,
"Correction due to changed cpio behavior".
For details, see https://jira.opnfv.org/browse/FUEL-125
Change-Id: I6c04e34cb7a5af5681745f1cdd026809c65720ce
(cherry picked from commit 890027f3b712797e699a3883d1f454a1d7c7c3bb)
|
|
Armband Fuel for aarch64 is very similar to amd64 in both
configuration and deployment, with a small difference in the build
process.
Therefore it makes sense to base our documentation on Jonas'
work in OPNFV Fuel.
(cherry picked from commit 719cf0300eb2c63375dde152851d6ba73ca99498)
Change-Id: I34e7b1ef7bc2f7928ebb04c39ed0a1d48c3a4b54
|
|
Fuel makes use of the REVSTATE variable in the make file to alter the
name of the resulting ISO image. We need to honor the revision specified
by the jenkins build system at OPNFV, and pass this variable along to
fuel@opnfv.
Change-Id: I1f80dfcae313058dd9a4486bbbfdfbb0b52ea405
Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
(cherry picked from commit 9a07b1737dd78f1f1bb8baeb3604379211ee84cf)
|
|
Currently we're close to 40 minutes of image building (thanks to
qemu-debootstrap). If network connectivity is a bit slow (happened to
me) it's easy to go over 1h limit. Therefore let's push this to 2 hours
to be safer.
Signed-off-by: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
(cherry picked from commit 8bbaf656043e99b265487dfc9c85ac37ca17abba)
Change-Id: I47069e7e67fb7c68f639e5089e346bdb78c0ae39
|