Comment 4 for bug 1806736

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

commit 4e299d65aea48eb3499dfd59b18c80875c911625
Author: Martin André <email address hidden>
Date: Tue Dec 4 18:22:18 2018 +0100

    Allow customization of more openshift-ansible vars

    The `openshift_master_cluster_hostname` and
    `openshift_master_cluster_public_hostname` variables are set to IP
    addresses by tripleo, but were wrongly combined with the
    openshift_global_vars dictionnary in a way that prevented customization
    via the OpenShiftGlobalVariables heat parameter.

    Reverse the order of the combine to make customization possible as they
    should.

    Change-Id: I47805608b90d8fda7d8357d3cb55f6372e746da1
    Closes-Bug: #1806736
    (cherry picked from commit 7c4b027a75afbf1491d7f74695be0f72b79e7320)