openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Allow customization of more openshift-ansible vars"

Browse Source
This commit is contained in:
Zuul 2019-01-05 12:14:20 +00:00 committed by Gerrit Code Review
commit fdba8a89e3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extraconfig/services/openshift-master.yaml
View File

@ -285,7 +285,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