packstack/plugins/serverprep_001:manage_rdo must handle both rdo-release and centos-release-openstack-* RPMs

[Alan Pevec]

As reported in https://www.redhat.com/archives/rdo-list/2016-March/msg00122.html
Packstack should handle both rdo-release and centos-release-openstack RPMs

[Javier Peña (jpena-c)]

https://review.openstack.org/298625 should fix it.

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/298625
Committed: https://git.openstack.org/cgit/openstack/packstack/commit/?id=d065ce7d8e81cde6da0a564141e68e3964943a40
Submitter: Jenkins
Branch: master

commit d065ce7d8e81cde6da0a564141e68e3964943a40
Author: Javier Pena <email address hidden>
Date: Tue Mar 29 10:58:46 2016 +0200

    Manage CentOS Cloud SIG repo if installed

    Up to now, Packstack only supported the RDO repo from rdoproject.org.
    The CentOS Cloud SIG repo can also be installed, so we need to check
    for it and install it if needed.

    Change-Id: I4336620677d21db8e33fe987d3d26cb6b512cc70
    Closes-Bug: #1561242

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/mitaka
Review: https://review.openstack.org/299720

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/299720
Committed: https://git.openstack.org/cgit/openstack/packstack/commit/?id=1ede906fa6a13d61ebc330c69ad9d8f7e692e5cc
Submitter: Jenkins
Branch: stable/mitaka

commit 1ede906fa6a13d61ebc330c69ad9d8f7e692e5cc
Author: Javier Pena <email address hidden>
Date: Tue Mar 29 10:58:46 2016 +0200

    Manage CentOS Cloud SIG repo if installed

    Up to now, Packstack only supported the RDO repo from rdoproject.org.
    The CentOS Cloud SIG repo can also be installed, so we need to check
    for it and install it if needed.

    Change-Id: I4336620677d21db8e33fe987d3d26cb6b512cc70
    Closes-Bug: #1561242
    (cherry picked from commit d065ce7d8e81cde6da0a564141e68e3964943a40)