From 7c4b027a75afbf1491d7f74695be0f72b79e7320 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Andr=C3=A9?= Date: Tue, 4 Dec 2018 18:22:18 +0100 Subject: [PATCH] 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 --- extraconfig/services/openshift-master.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extraconfig/services/openshift-master.yaml b/extraconfig/services/openshift-master.yaml index b2e2caf56c..d12ebdfe7f 100644 --- a/extraconfig/services/openshift-master.yaml +++ b/extraconfig/services/openshift-master.yaml @@ -289,7 +289,7 @@ outputs: - name: combine cluster setting set_fact: - openshift_global_vars: "{{ openshift_global_vars | combine(openshift_master_cluster_vars) }}" + openshift_global_vars: "{{ openshift_master_cluster_vars | combine(openshift_global_vars) }}" when: 'tripleo_node_group_name != "node-config-all-in-one"' - name: generate openshift global vars