openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix all outputs|failed and outputs is defined"

This commit is contained in:
Zuul 2017-11-21 11:52:07 +00:00 committed by Gerrit Code Review
parent 39bcda2bed ed2b957a4f
commit bdc1697af5
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/deploy-steps-tasks.yaml
View File

@ -25,7 +25,7 @@
no_log: true no_log: true
become: true become: true
- debug: var=(outputs.stderr|default('')).split('\n')|union(outputs.stdout_lines|default([])) - debug: var=(outputs.stderr|default('')).split('\n')|union(outputs.stdout_lines|default([]))
when: outputs is defined when: outputs.rc is defined
failed_when: outputs.rc not in [0, 2] failed_when: outputs.rc not in [0, 2]
###################################### ######################################
# Generate config via docker-puppet.py # Generate config via docker-puppet.py
@ -44,8 +44,8 @@
no_log: true no_log: true
become: true become: true
- debug: var=(outputs.stderr|default('')).split('\n')|union(outputs.stdout_lines|default([])) - debug: var=(outputs.stderr|default('')).split('\n')|union(outputs.stdout_lines|default([]))
when: outputs is defined when: outputs.rc is defined
failed_when: outputs|failed failed_when: outputs.rc != 0
################################################## ##################################################
# Per step starting of the containers using paunch # Per step starting of the containers using paunch
################################################## ##################################################
@ -70,8 +70,8 @@
no_log: true no_log: true
become: true become: true
- debug: var=(outputs.stderr|default('')).split('\n')|union(outputs.stdout_lines|default([])) - debug: var=(outputs.stderr|default('')).split('\n')|union(outputs.stdout_lines|default([]))
when: outputs is defined when: outputs.rc is defined
failed_when: outputs|failed failed_when: outputs.rc != 0
######################################################## ########################################################
# Bootstrap tasks, only performed on bootstrap_server_id # Bootstrap tasks, only performed on bootstrap_server_id
######################################################## ########################################################
@ -95,5 +95,5 @@
no_log: true no_log: true
become: true become: true
- debug: var=(outputs.stderr|default('')).split('\n')|union(outputs.stdout_lines|default([])) - debug: var=(outputs.stderr|default('')).split('\n')|union(outputs.stdout_lines|default([]))
when: outputs is defined when: outputs.rc is defined
failed_when: outputs|failed failed_when: outputs.rc != 0

4
extraconfig/services/kubernetes-master.yaml
View File

@ -163,5 +163,5 @@ outputs:
- name: print kubespray outputs - name: print kubespray outputs
debug: debug:
var: (outputs.stderr|default('')).split('\n')|union(outputs.stdout_lines|default([])) var: (outputs.stderr|default('')).split('\n')|union(outputs.stdout_lines|default([]))
failed_when: outputs|failed failed_when: outputs.rc != 0
when: outputs is defined when: outputs.rc is defined