openstack/tripleo-heat-templates
Code Issues Proposed changes

Revert "Revert "Tag workflows created by the templates""

Browse Source 
Also touches ceph-ansible/ceph-base.yaml to make sure this is
tested by scenario001

Change-Id: I7a7beea36669a79662f384315a3fbd19c958de8a
Related-Bug: #1715389
This commit is contained in:
Giulio Fidente 2017-09-13 19:34:14 +02:00
parent 052ad2607f
commit f890e4e512
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/deploy-steps.j2
View File

@ -134,6 +134,9 @@ resources:
properties: properties:
name: {list_join: [".", ["tripleo", {get_param: stack_name}, "workflow_tasks", "step{{step}}"]]} name: {list_join: [".", ["tripleo", {get_param: stack_name}, "workflow_tasks", "step{{step}}"]]}
type: direct type: direct
tags:
- tripleo-heat-templates-managed
- {get_param: stack_name}
tasks: tasks:
yaql: yaql:
expression: $.data.where($ != '').select($.get('step{{step}}')).where($ != null).flatten() expression: $.data.where($ != '').select($.get('step{{step}}')).where($ != null).flatten()

2
docker/services/ceph-ansible/ceph-base.yaml
View File

@ -187,7 +187,7 @@ outputs:
workflow_tasks: workflow_tasks:
step2: step2:
- name: ceph_base_ansible_workflow - name: ceph_base_ansible_workflow
workflow: { get_param: CephAnsibleWorkflowName } workflow: {get_param: CephAnsibleWorkflowName}
input: input:
ansible_skip_tags: {get_param: CephAnsibleSkipTags} ansible_skip_tags: {get_param: CephAnsibleSkipTags}
ceph_ansible_extra_vars: {get_param: CephAnsibleExtraConfig} ceph_ansible_extra_vars: {get_param: CephAnsibleExtraConfig}