summaryrefslogtreecommitdiffstats
path: root/apex/tests
AgeCommit message (Collapse)AuthorFilesLines
2019-04-22Update openstack refs to opendevananth.y1-1/+1
Change-Id: Ia4175031ed3b858d0e832514e6d8b2e7efb8c285 Signed-off-by: ananth.y <ananth.y@hcl.com>
2019-03-20Fixes deployment on CentOS 7.6Tim Rozet1-4/+4
Ceph-ansible install is moved from image builder to post undercloud install to ensure the right repo exists and it used. OVS building is now skipped as the build fails with CentOS 7.6. JIRA: APEX-658 Change-Id: I6ec253d5a88eb3cdfa38cf177b6e4b16ac5a16ed Signed-off-by: Tim Rozet <trozet@redhat.com>
2019-01-11Fixes undercloud install failure with setting hostnameTim Rozet1-0/+5
There is a new bug when deploying master/rocky where the OS of the undercloud/overcloud is now upgraded to CentOS 7.6. When the undercloud install runs it fails to configure the hostname using hostnamectl. This is because systemd-hostnamed is not running and fails to start. Simply reloading dbus seems to fix the issue. In the dbus logs there are odd error messages like: dbus-daemon[3230]: Unknown username "root" in message bus configuration file Disabling selinux seems to fix this. This patch also moves to use podman instead of docker for container management and invokes a script in Ansible which updates NIC templates as new variables are added upstream. Furthermore, with the new patches for routed networks in OOO, it is now required that the MTU is set in network-data, as well as adding the External network to the Compute role. Now the External network is removed by default from the Compute role. Change-Id: Ie8b86f6f28d69bda11b1f7a430df882970ac3cb9 Signed-off-by: Tim Rozet <trozet@redhat.com>
2019-01-03Renders service net map for THTTim Rozet1-0/+7
Previously if a service mapped to a network which was disabled, the disabled network would fallback to using the ctlplane network. With the recent change in THT, this is no longer the case: https://review.openstack.org/#/c/614457/ With the above change, now any service pointing to a disabled network now results in an empty string value being given for network variables. This patch sets the service netmap in network-enviornment.yaml appropriately based on which networks are enabled in apex. Change-Id: Idf2919935aa707da6ca48968a04cf6653923d19d Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-12-21Always update OVS to 2.9.2Tim Rozet1-3/+11
Right now RDO defaults to an old version of OVS. In Apex for non-sfc scenarios we were pulling a prebuilt RPM of OVS 2.9.0 that included a group tables fix needed for ODL. For SFC, we now just build OVS along with the kernel module from native OVS because NSH support exists upstream in that version. We can move to always doing this operation for all OVS based scenarios, which will bump our OVS and ensure the package we build at runtime will work with our kernel. Change-Id: If38d0b858878f1af66990d987612a8f8f6fa2718 Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-11-18Bring in aarch64 support in apexCharalampos Kominos1-5/+12
RDO builds packages which are aarch64 compatible but some configuration is needed to succesfully deploy. This change: - Prepares the aarch64 docker.io repo as the source for Kolla Containers - Configures VM sizing for aarch64 undercloud. - Configures VM sizing for aarch64 virtual deploy targets. Vms need to be larger on aarch64 compared to x86 to avoid starvation of resources. (MYSQL) - Configures vda2 as the location of the Linux Kernel in aarch64 in an UEFI system - Configures the vNICs to be on the pci-bus instead of the virtio-mmio bus.This will enalbe the Nics to come up in the same order as the x86 ones, so the extra configuration in ansible is not needed - Configures apex to use a stable version of the ceph:daemon container - Configure apex for containerized undercloud in Rocky - Add extra ansible.cfg file for aarch64 which increases waiting times in ansible for aarch64 - Provide helper scripts for DIB to create aarch64 UEFI images Known limitations: - Selinux is interfering with DHCP requests in ironic and ssh so it must be disabled before the deploy command is ran. - The aarch64 containers are frozen for in this commit: https://trunk.rdoproject.org/centos7-rocky/f3/18/f3180de6439333a2813119ad4b00ef897fcd596f_70883030 - The 600s timeout defined in : https://bugs.launchpad.net/tripleo/+bug/1789680 is not enough for aarch64. A value of 1200s is recommended JIRA: APEX-619 Change-Id: Ia3f067821e12bba44939bbf8c0e4676f2da70239 Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com> Signed-off-by: ting wu <ting.wu@enea.com>
2018-11-13Remove downloading undercloud.qcow2Tim Rozet1-2/+16
OOO team is removing the undercloud disk image as it is no longer needed for containerized undercloud deployments. Instead, we can just use the overcloud image as the undercloud image. Additionally, OOO team has recommended we use current-tripleo instead of current-tripleo-rdo. current-tripleo-rdo was previously thought to be more stable with more promotion checks, but now it seems that it is older and current-tripleo now has the same stability/checks. This patch also bumps the undercloud RAM from 8GB to 10GB. With the new containerized undercloud there is more RAM consumption during deployment. Change-Id: I9e6bb2260dbe9f8796ee54d20527c0aad96476ec Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-11-01Fix neutron_driver for odlTim Rozet1-3/+3
The neutron_driver for opendaylight needs to be set to 'odl' instead of 'opendaylight' Change-Id: Ib9345d8b9fc8be5b7a49ac961a2499220c1c1bd6 Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-11-01Fixes Docker image upload for master/rockyTim Rozet3-4/+59
The API has changed to create/upload the docker container images to be used for deployment. In the past the prepare commands would read the THT environment files passed, to determine which docker images to render into an environment file. The new behavior uses a new "containers-prepare-parameter.yaml" format (included in this patch), which Apex will now configure for deployment. By default docker images will be rendered for all TripleO services identified in the roles_data.yaml file. Therefore we must use several excludes patterns to only pull the docker images needed for a default deployment. JIRA: APEX-642 Change-Id: Iab00fcb874554bb98540dc9a4c3051e58ea68a3b Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-10-16Updates rdo images URLTim Rozet1-1/+1
The delorean path does not have images for rocky, however they do exist under the rdo_trunk path. Comparing the images for queens between the 2 paths looks the same, so switching to this URL. Change-Id: I5d762af69b984c0fed1c79b73f2b4d61341298fa Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-10-08Merge "Adding support for containerized undercloud"Tim Rozet1-1/+3
2018-10-08Adding support for containerized undercloudRicardo Noriega1-1/+3
Master code only supports containerized undercloud now, so this migration is needed. - Containerized services in undercloud We can still apply patches to THT and other non-docker services, but we will need to add support for patching openstack services on undercloud. Change-Id: I1ca4c6108f144efef7b5889503af265ef0fff8b2 Signed-off-by: Ricardo Noriega <rnoriega@redhat.com> Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-09-27Enable OVN scenariosTim Rozet1-0/+6
As of Queens only HA OVN deployments are supported. Change-Id: I184c5a096fec9cbc3cf2ec06218700138ea3ed57 Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-08-23Adds deployment via snapshotTim Rozet8-9/+685
New arguments are added to allow snapshot deployment: --snapshot, --snap-cache The previous tripleo-quickstart code has been removed/replaced with the snapshot option. Snapshot deployments are supported on CentOS and Fedora, and snapshot artifacts use a similar caching system as the standard deployment. Snapshots are produced daily by Apex, and include latest as well as n-1 OpenStack versions. The os-odl-nofeature scenario is used for the snapshots. Additionally multiple topology verions of Snapshots are available. The Snapshot pulled at deploy time depends on the deploy-settings and number of virtual-computes used at deploy time. Since there is only one network used with snapshot deployments (admin), there is no reason to pass in network settings for snapshot deployments. That argument is now optional. Previously we required even in Standard virtual deployments that the network settings be provided. However that is also unnecessary, as we can default to the virtual network settings. Includes minor fix to the tox.ini to allow specifying test cases to run (useful for developers writing tests). Default behavior of tox is unchanged. JIRA: APEX-548 Change-Id: I1e08c4e54eac5aae99921f61ab7f69693ed12b47 Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-08-23Recover fix to install custom OVSRicardo Noriega1-20/+31
Need this fix to make VLAN tenant networks to work. Change-Id: Ie2dea9f0145c576e1b36280e6340ed2cc0460179 Signed-off-by: Ricardo Noriega <rnoriega@redhat.com>
2018-08-22Merge "Enable SFC scenarios for Gambia"Tim Rozet2-1/+32
2018-08-22Enable SFC scenarios for GambiaRicardo Noriega2-1/+32
- This patch will install OVS 2.9.2 including its kernel module which allows native NSH headers. - Fix Custom OVS due to bug: https://bugzilla.redhat.com/show_bug.cgi?id=1544892 - Tacker is disable for the time being, tacker-conductor needs to be enabled. JIRA: APEX-630 Change-Id: Ia410309fd7053602ce78eae919839d0f57c9742a Signed-off-by: Ricardo Noriega <rnoriega@redhat.com>
2018-08-20Fixes unit test failuresTim Rozet1-0/+4
Adds mocking some file opens introduced by: https://gerrit.opnfv.org/gerrit/#/c/60991/ Change-Id: I013b9c96a7c3f678c6e227f98cd58f9547d79ecb Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-08-15Modify common patches schema to per branchTim Rozet2-3/+32
The common patch design doesn't really work across branches very well. This patch makes it so the common patches are specified in the same file, but on a per branch basis. Making it easier to manage common patches per branch. Also, includes a fix and adds test coverage to the prep_image method where we were referencing 'undercloud_admin_ip' before assignment in a case where we were not using ODL and had patches to overcloud. Change-Id: I7672947afd826fdc0042361a0139e22d6d5dd864 Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-08-14Allow common patches fileTim Rozet5-4/+85
This patch adds allowing for common patches that should be applied to every scenario to be included. It by default pulls in a file in the deploy directory 'common-patches.yaml', but can optionally be overridden. This patch also includes a patch upstream to fix OSCLI not working anymore due to breakage with the Cinder version in the overcloudrc. Change-Id: I97b9efb937deff07e085b9ef75b9799fb65bfc57 Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-08-10Allow all in one deploymentsTim Rozet3-26/+49
This patch adds the ability to deploy all in one single nodes (Control + Compute). To enable this functionality do the following for each deployment type: - Baremetal: do not tag any nodes as compute in the inventory file - Virtual: use argument '--virtual-computes 0' JIRA: APEX-548 Change-Id: I22525c9eb21d331129c819449316c26a6fcf522d Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-08-02Enable BGPVPN for master deploymentsRicardo Noriega1-8/+40
- Injection of Quagga tarball via overcloud builder. - Extraction and installation of all related packages. - It uses SDNVPN artifact repository to download Quagga tarball, so there is only one source to test. - Modifies bgpvpn scenario files to use OS master branch, ODL master branch and containers. JIRA: APEX-627 Change-Id: Icdbc2853d9531048e23fd6d5e444bd68208d18fc Signed-off-by: Ricardo Noriega <rnoriega@redhat.com>
2018-07-26Merge "Remove obsolete Ceph tags"Tim Rozet1-3/+0
2018-07-26Remove obsolete Ceph tagsRicardo Noriega1-3/+0
This patch removes the logic to use an specific tag for Ceph containers. We will use whatever docker image TripleO upstream uses. For aarch64, an ansible task will replace the tag to pull the proper container image. This patch also refactors the preparation of the local registry. In Queens, there is no need to execute twice the overcloud container image prepare command. JIRA: APEX-622 Change-Id: I947d931609e58505675bb460a59d08c1d10d1d0b Signed-off-by: Ricardo Noriega <rnoriega@redhat.com>
2018-07-20Fixes for snapshotsTim Rozet1-0/+2
With deploying snapshots with a new ODL, we currently bring down the docker container and bring up the tar.gz distro of ODL on the Overcloud host itself (not rebuilding/using container). Therefore we need java installed so that ODL can run on the host. In the future this may change, but it works well and keeps things simple for now. Additionally, there was a change upstream to make the opendaylight container docker restart policy "unless-stopped" which means it will no longer restart automatically when docker is stopped/started. Therefore on first snapshot bring up (without the previously mentioned ODL reinstallation) the container does not start, and snapshot deployment fails. This patch includes a change to the restart policy to always restart it. Change-Id: Icc712ba147e578a28e371313154ae3190676f0dc Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-07-18Add tenant vlan supportFeng Pan1-36/+146
Introduces tenant vlan support through configuration of network settings file. JIRA: APEX-272 Change-Id: Ie8e20a92ca4ebb9e0de4c53b5e03856d19ff660c Signed-off-by: Feng Pan <fpan@redhat.com>
2018-07-18Add param for ODL password into overcloudrcTim Rozet1-2/+2
Recent changes upstream have removed the default 'admin' ODL password and now password is randomly generated: https://review.openstack.org/#/c/578505/ So in OPNFV we now store the password in overcloudrc as SDN_CONTROLLER_PASSWORD variable. Also includes minor fixes to unittests. Change-Id: Iabe7e4f902442c80af99ba1603a3927cf13d0393 Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-07-06Add support for kubernetes deploymentZenghui Shi3-3/+68
This patch adds capability to deploy kubernetes cluster instead of openstack. Kubernetes will be deployed using kubespray and is run after TripleO bookstraps overcloud nodes. JIRA: APEX-574 Change-Id: If9c171620c933a052b719e7112a50e22bbab667f Signed-off-by: Feng Pan <fpan@redhat.com> Signed-off-by: Zenghui Shi <zshi@redhat.com>
2018-06-25Deprecates the use of '--upstream' argumentTim Rozet2-10/+22
We only support the use of upstream deployments from Gambia onwards. Therefore deprecating the parameter and forcing upstream to always be used. Change-Id: I7926a65a2c32bca2272855ba45fdb6005f67616f Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-06-18Fixes Ceph PG calculationTim Rozet1-1/+1
Baremetal deployments were failing because the ceph PG size was exceeding the max allowed. Virtual was still working because we lower the number of pools and pg/osd. This patch changes the values to a number which should work for both virtual and baremetal. Also includes a fix which adds the controllers back as OSDs and a few other cleanup issues. JIRA: APEX-614 JIRA: APEX-569 Change-Id: I2ad65727ecdcaa0454eb53d25e32b7f1a53cd3a4 Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-06-14Fixes deployment failure with allNodesConfigTim Rozet1-3/+98
This pulls in upstream patch to revert a bad commit that causes the "Unknown Property controller_ips". Also includes a fix for being able to detect if patches that are merged upstream are also promoted into TripleO images or container images. This happens by comparing the time the patch was submitted to the time when the TripleO Image or Docker Image was last updated. JIRA: APEX-610 JIRA: APEX-612 Change-Id: I1c2ab7fb4425b407acd7b6d9ebab914ed3a24478 Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-05-30Configure NAT with baremetal when necessaryTim Rozet1-0/+100
We currently only enable NAT on undercloud for virtual deployments. However, there could be a case where a baremetal deployment also needs NAT as it is not using an interface on the overcloud nodes with external access. Therefore this patch changes the behavior to configure NAT when the gateway of either the external or admin (when external is disabled) network matches an IP assigned to the undercloud. JIRA: APEX-605 Change-Id: I9c79af371913e6e5f0d39b433f68205bc7e106c5 Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-05-23Default ctlplane to native VLANTim Rozet1-0/+3
We were not setting any vlan type value for the admin network. This caused an issue when deploying and trying to use a single collapsed network (no net isolation). The issue occurred when trying to create an external neutron network. We happen to check if the phys type is flat or vlan using this attribute to decide what kind of phys type to use for the neutron network. JIRA: APEX-606 Change-Id: I4e24dd5e8b99cef920b8203b820a77d0021631cc Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-05-21Migrates master to use direct upstreamTim Rozet2-3/+13
We now move master to deploy from upstream. That means we do not need to build undercloud/overcloud images anymore. Changes-Include: - Remove bash build scripts as we do not need to build anything other than the python package anymore - Remove building images or iso from build.py - Remove building of images and iso from Makefile - Rename/refactor deploy settings files for nosdn and odl. The new convention is that the typical scenario names we use will deploy master. We also support n-1 OS, so in that case we use the branch name for the "feature" in the scenario name: os-odl-queens-noha. - Tacker/Congress are disabled in settings files until we fix that with upstream. Containers are now enabled by default. - Disable TLS for undercloud (was changed upstream to default enabled) - Fix environments docker directory for master THT (was changed upstream) - Includes fix for LP#1768901 - Includes workaround for LP#1770692 - Moves to docker.io for container images as it is more stable and should contain the same images - Removes the term 'common' from apex packaging for referencing the Python Apex package Change-Id: If6b433860b3ff882686c78d0f24a2f0c52b9b57a Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-04-17Fix nosdn fdio scenarioFeng Pan1-4/+36
- Update networking-vpp to use master branch - Update THT vpp ml2 environment file with correct parameters - Update external network creation command to use 'externa' as provider network name. - Remove vpp network settings file as it's not used apex-tripleo-heat-templates: Ia25db8456f1ad6beb96c7b9b5f318b166ef4576a apex-puppet-tripleo: I231054a433eb7e598a6e24f6eaea02d476e776de Change-Id: I4a1f68c75ae3b7d2a5b347d05abf0d025e8b116b Signed-off-by: Feng Pan <fpan@redhat.com>
2018-04-06Fixes delorean repo update on undercloudTim Rozet1-1/+1
Previous fix to update delorean repo on undercloud was always failing because the operations passed to virt-customize were not in a list type. JIRA: APEX-565 Change-Id: Ic883309ac1c3aa6027dc252635e404e5355c269d Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-03-28Generalization of recursive functionRicardo Noriega1-0/+8
Now, SDN_MAP is not needed to have a boolean true value, but it will check internally posible value formats such dicts and tuples. Change-Id: Idaf492952a7dd9e48e16f42dcbf5c59d981dd535 Signed-off-by: Ricardo Noriega <rnoriega@redhat.com>
2018-03-16Enables containerized overcloud deploymentsTim Rozet8-29/+763
Changes Include: - For upstream deployments, Docker local registry will be updated with latest current RDO containers, regular deployments will use latest stable - Upstream container images will then be patched/modified and then re-uploaded into local docker registry with 'apex' tag - Deployment command modified to deploy with containers - Adds a --no-fetch deployment argument to disable pulling latest from upstream, and instead using what already exists in cache - Moves Undercloud NAT setup to just after undercloud is installed. This provides internet during overcloud install which is now required for upstream container deployments. - Creates loop device for Ceph deployment when no device is provided in deploy settings (for container deployment only) - Updates NIC J2 template to use the new format in OOO since the os-apply-config method is now deprecated in > Queens JIRA: APEX-566 JIRA: APEX-549 Change-Id: I0652c194c059b915a942ac7401936e8f5c69d1fa Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-03-15Adding SRIOV scenarioRicardo Noriega1-3/+58
This scenario should enable SRIOV interfaces to be used by Neutron. Only will be supported in baremetal deployments with SRIOV capable NICs. The name of the interface must be known in advance and the physnet of the SRIOV network is set as nfv_sriov. Change-Id: Ie4295413e0be2197bd9ada4f887f6b47cd486765 Signed-off-by: Ricardo Noriega <rnoriega@redhat.com>
2018-02-16Merge "Fixes ensuring VBMCs are actually running"Feng Pan1-1/+19
2018-02-16Merge "Fixes stale undercloud delorean repos"Feng Pan1-0/+15
2018-02-16Fixes ensuring VBMCs are actually runningTim Rozet1-1/+19
We currently start VBMCs using CLI due to issues with the VBMC python lib. However when we start them, there is no check to make sure they are actually changed to 'running' status. This patch adds logic to check (up to 5 times) to ensure each VBMC is running or raises an error. Note this is for virtual deployments only. JIRA: APEX-527 Change-Id: Iab7ee3b76292d6fc547f18c83f23c04205e9bb2e Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-02-16Add http(s)_proxy handling to apexDan Radez1-6/+11
JIRA: APEX-512 Change-Id: I875bd99203b425e448e7a3f64eb9a8f99d03ddaf Signed-off-by: Dan Radez <dradez@redhat.com>
2018-02-16Fixes stale undercloud delorean reposTim Rozet1-0/+15
When we build artifacts for release, we try to freeze the disk images and artifacts we use for deployment. This includes the delorean repo which provides OpenStack packages. This repo however expires after a couple months and then if any packages were missing in the Undercloud released artifact, they will attempt to be downloaded during install and fail. This patch adds some logic to detect if there is internet connectivity, and if so then download and update the delorean repo on the undercloud. JIRA: APEX-565 Change-Id: I58c28437fb5c5b179033c939377fd97aefbf427c Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-02-07Allow disabling ipxe for provisioningDan Radez1-3/+6
JIRA: APEX-535 Change-Id: I52d17e962fc4a504db1ddbc20df0ac56a208f34b Signed-off-by: Dan Radez <dradez@redhat.com>
2018-01-11Fixes including default SDN env file in deploy cmdTim Rozet1-0/+10
The latest method to deploy opendaylight features upstream is to include the default SDN file and then add-on the feature env file which should override any default settings in the previous SDN env file. For example for bgpvpn: openstack overcloud deploy -e <tht_dir>/neutron-opendaylight.yaml -e \ <tht_dir>/neutron-bgpvpn-opendaylight.yaml This change documents the recursive function used to find the SDN env files and includes the default for the SDN controller. JIRA: APEX-555 Change-Id: I4270932ca4fbc21ea54e965d9d6491424f4463e2 Signed-off-by: Tim Rozet <trozet@redhat.com>
2017-11-28Fixes upstream deploymentsTim Rozet1-0/+1
There was an issue with patching the overcloud where the patch binary is missing, making it impossible to apply patches. This change install patch now on the image. Also, although deployments were successful, storage was not working. This is because by default upstream does not apply Ceph OSDs to compute nodes for hyperconverged Ceph, but we use this as our standard deployment in Apex. This patch inserts CephOSD into the default Compute role. Note: we normally override role's services in regular Apex deployments so we do not hit this issue there. Change-Id: I5bddda4784dc00148395863ae0990343a4159602 Signed-off-by: Tim Rozet <trozet@redhat.com>
2017-11-16Migrates Apex to PikeTim Rozet3-12/+9
JIRA: APEX-544 Change-Id: Ibee2068e782da75268ed76beb36ccb5dcd1847d6 Signed-off-by: Tim Rozet <trozet@redhat.com>
2017-11-06Adds ability to deploy from upstream openstackTim Rozet6-2/+287
To deploy with upstream openstack branch, use new deploy setting 'os_version'. A default scenario file for nosdn with pike has been included in this patch. If 'os_version' is a version other than the default version for this OPNFV release, then upstream is used. In order to use upstream with the current OS version use '--upstream' argument to the deploy command, to force an upstream deployment. Also include '-e upstream-environment.yaml' to use default upstream deployment settings. Supports nosdn and odl-nofeature deployments. Change-Id: Ic07e308827b449637b4e86cdd086434e4de2fb69 Signed-off-by: Tim Rozet <trozet@redhat.com>
2017-10-18Fix interface role mapping config for odl-fdio scenariosFeng Pan1-7/+23
This patch fixes a bug in deploy config function that will make performance parameters overwrite interface role mapping config for honeycomb. apex-os-net-config: Ifa3b18aa6370c79ad6ad3ce983f1648ff0d1d79d Change-Id: Icdb7603577bc7edf1959238ddd3d686c310544ce Signed-off-by: Feng Pan <fpan@redhat.com>