enhance dry-ness of base dockerfile.j2

[Steven Dake]

The base dockerfile.j2 has two sections which install an rdo repo when only one is really needed.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/237939

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/237939
Committed: https://git.openstack.org/cgit/openstack/kolla/commit/?id=c7a9835b683d0177c93dd2751ec9acb688e106f9
Submitter: Jenkins
Branch: master

commit c7a9835b683d0177c93dd2751ec9acb688e106f9
Author: Steven Dake <email address hidden>
Date: Wed Oct 21 04:53:36 2015 -0400

    Improve dry-ness of base dockerfile.j2

    The delorean repositories no longer have a separate location for
    openvswitch. Now openvswitch is located in delorean-deps.repo
    and the rest of delorean master is located in the delorean.repo
    file. These files can be installed for both RDO and SOURCE, but
    not for RHOS. This patch uses the install_metatype to make a
    determination as to when to install these two repos. In the
    process, we can remove the source RPM installation.

    Change-Id: Ieedddd9d7ee234b6acdb03f7043d57c18e024951
    Closes-Bug: #1508326

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/liberty
Review: https://review.openstack.org/237961

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/237961
Committed: https://git.openstack.org/cgit/openstack/kolla/commit/?id=1fb1fcb4dedf2e93771a7ce0c955e581637adeab
Submitter: Jenkins
Branch: stable/liberty

commit 1fb1fcb4dedf2e93771a7ce0c955e581637adeab
Author: Steven Dake <email address hidden>
Date: Wed Oct 21 04:53:36 2015 -0400

    Improve dry-ness of base dockerfile.j2

    The delorean repositories no longer have a separate location for
    openvswitch. Now openvswitch is located in delorean-deps.repo
    and the rest of delorean master is located in the delorean.repo
    file. These files can be installed for both RDO and SOURCE, but
    not for RHOS. This patch uses the install_metatype to make a
    determination as to when to install these two repos. In the
    process, we can remove the source RPM installation.

    Closes-Bug: #1508326
    (cherry picked from commit c7a9835b683d0177c93dd2751ec9acb688e106f9)
    Change-Id: Ieedddd9d7ee234b6acdb03f7043d57c18e024951