Tripleo won't let override of openshift_master_cluster_hostname and openshift_master_cluster_public_hostname variables

[Martin André]

From https://bugzilla.redhat.com/show_bug.cgi?id=1655184

openshift_master_cluster_hostname and openshift_master_cluster_public_hostname always get set to IP addresses. I am unable to set them to hostnames.

Version-Release number of selected component (if applicable):
openstack-tripleo-heat-templates-9.0.1-0.20181013060891.el7ost.noarch

How reproducible:
100%

Steps to Reproduce:
1. Deploy openshift overcloud with:

parameter_defaults:
  CloudName: public.openshift.localdomain
  PublicVirtualFixedIPs: [{'ip_address':'10.0.0.200'}]

  CloudNameInternal: internal.openshift.localdomain
  InternalApiVirtualFixedIPs: [{'ip_address':'172.17.1.200'}]

  CloudDomain: openshift.localdomain

  OpenShiftGlobalVariables:
    openshift_master_cluster_hostname: internal.openshift.localdomain
    openshift_master_cluster_public_hostname: public.openshift.localdomain
    openshift_master_default_subdomain: apps.openshift.localdomain

Actual results:
 [root@undercloud-0 stack]# grep openshift_master_cluster_hostname /var/lib/mistral/openshift/openshift/global_vars.yml
openshift_master_cluster_hostname: 172.17.1.200
 [root@undercloud-0 stack]# grep openshift_master_cluster_public_hostname /var/lib/mistral/openshift/openshift/global_vars.yml
openshift_master_cluster_public_hostname: 10.0.0.200

Expected results:
    openshift_master_cluster_hostname: internal.openshift.localdomain
    openshift_master_cluster_public_hostname: public.openshift.localdomain

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

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

commit 7c4b027a75afbf1491d7f74695be0f72b79e7320
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

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

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)

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

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