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
This commit is contained in:
parent
2557bfdf14
commit
7c4b027a75
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user