openstack/tripleo-heat-templates
Code Issues Proposed changes

Make openshift-master service idempotent

Browse Source 
The openshift-master service will fail any time it is used with a
stack update. This is because the openshift_upgrade var is not
defined, but is checked whenever tripleo_stack_action == 'UPDATE'.

This patch adds a check for openshift_upgrade being defined before
checking if it is True.

Closes-Bug: 1794824
Change-Id: I3a598724154a3242b777eefed9304300c45d8c29
This commit is contained in:
trown 2018-09-27 11:41:24 -04:00 committed by Martin André
parent 8caaee30a9
commit d295cd94b8
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

@ -362,7 +362,7 @@ outputs:
{% endif %}
{% endif %}
{% if tripleo_stack_action == 'UPDATE' and openshift_upgrade %}
{% if tripleo_stack_action == 'UPDATE' and openshift_upgrade is defined and openshift_upgrade %}
- include: "{{openshift_upgrade_playbook_path}}"
{% endif %}