Tripleo doesn't deploy Openshift service catalog and template service broker

[Martin André]

These two services were disabled a long time ago (presumably to shorten the deployment time?) and never re-enabled:

https://github.com/openstack/tripleo-heat-templates/blob/d295cd9/extraconfig/services/openshift-master.yaml#L176-L178

They are however enabled by default by openshift-ansible and as a result we expect tripleo to also deploy them in its default setting.

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/621526
Committed: https://git.openstack.org/cgit/openstack/tripleo-common/commit/?id=9d53ff37713d1192dc1c7c0b3b4f1832c9c7b29d
Submitter: Zuul
Branch: master

commit 9d53ff37713d1192dc1c7c0b3b4f1832c9c7b29d
Author: Martin André <email address hidden>
Date: Mon Dec 3 10:30:19 2018 +0100

    Additional images for openshift services

    This commit adds missing images for openshift service catalog and
    template service broker. These two services are enabled by default by
    openshift-ansible and as a result, tripleo should deploy them in its
    default setting too (they were explicitly disabled in tht until now).

    Change-Id: Ic358ed27d63015d297f50c10f553fc1c470ea6a5
    Partial-Bug: #1806353

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/rocky
Review: https://review.openstack.org/628447

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/628447
Committed: https://git.openstack.org/cgit/openstack/tripleo-common/commit/?id=112cc3b5253144f1362ca51e63c386a0abff0a78
Submitter: Zuul
Branch: stable/rocky

commit 112cc3b5253144f1362ca51e63c386a0abff0a78
Author: Martin André <email address hidden>
Date: Mon Dec 3 10:30:19 2018 +0100

    Additional images for openshift services

    This commit adds missing images for openshift service catalog and
    template service broker. These two services are enabled by default by
    openshift-ansible and as a result, tripleo should deploy them in its
    default setting too (they were explicitly disabled in tht until now).

    Change-Id: Ic358ed27d63015d297f50c10f553fc1c470ea6a5
    Partial-Bug: #1806353
    (cherry picked from commit 9d53ff37713d1192dc1c7c0b3b4f1832c9c7b29d)

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/621534
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=e26a5ea3be34c8ed2e9c12bbfb04ccde24aa25c9
Submitter: Zuul
Branch: master

commit e26a5ea3be34c8ed2e9c12bbfb04ccde24aa25c9
Author: Martin André <email address hidden>
Date: Mon Dec 3 10:49:26 2018 +0100

    Rely on osa defaults for enabled services

    Tripleo should rely on openshift-ansible defaults as much as possible,
    especially concerning the services which are enabled.

    This removes the setting that explicitly disabled the service catalog
    and template service broker, and wire in the ansible-service-broker
    from heat parameters. The service-catalog and template-service-broker
    images do not need to be specified since they're derived from the
    oreg_url in openshift-ansible.

    Change-Id: Ie09696a54ba01f23003366a9f221d2f32f4b0270
    Depends-On: Ic358ed27d63015d297f50c10f553fc1c470ea6a5
    Closes-Bug: #1806353

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/rocky
Review: https://review.openstack.org/631714

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/631714
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=4017891ab9caaeb5ff6d2b059bb066c1bf56c648
Submitter: Zuul
Branch: stable/rocky

commit 4017891ab9caaeb5ff6d2b059bb066c1bf56c648
Author: Martin André <email address hidden>
Date: Mon Dec 3 10:49:26 2018 +0100

    Rely on osa defaults for enabled services

    Tripleo should rely on openshift-ansible defaults as much as possible,
    especially concerning the services which are enabled.

    This removes the setting that explicitly disabled the service catalog
    and template service broker, and wire in the ansible-service-broker
    from heat parameters. The service-catalog and template-service-broker
    images do not need to be specified since they're derived from the
    oreg_url in openshift-ansible.

    Change-Id: Ie09696a54ba01f23003366a9f221d2f32f4b0270
    Depends-On: Ic358ed27d63015d297f50c10f553fc1c470ea6a5
    Closes-Bug: #1806353
    (cherry picked from commit e26a5ea3be34c8ed2e9c12bbfb04ccde24aa25c9)

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/tripleo-heat-templates 10.4.0 release.

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/tripleo-heat-templates 9.3.0 release.