From f890e4e5120e7e969a1d0c9ca10a798ddb626eef Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Wed, 13 Sep 2017 19:34:14 +0200 Subject: [PATCH] Revert "Revert "Tag workflows created by the templates"" Also touches ceph-ansible/ceph-base.yaml to make sure this is tested by scenario001 Change-Id: I7a7beea36669a79662f384315a3fbd19c958de8a Related-Bug: #1715389 --- common/deploy-steps.j2 | 3 +++ docker/services/ceph-ansible/ceph-base.yaml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2 index 5f6082f84f..415c970e68 100644 --- a/common/deploy-steps.j2 +++ b/common/deploy-steps.j2 @@ -134,6 +134,9 @@ resources: properties: name: {list_join: [".", ["tripleo", {get_param: stack_name}, "workflow_tasks", "step{{step}}"]]} type: direct + tags: + - tripleo-heat-templates-managed + - {get_param: stack_name} tasks: yaql: expression: $.data.where($ != '').select($.get('step{{step}}')).where($ != null).flatten() diff --git a/docker/services/ceph-ansible/ceph-base.yaml b/docker/services/ceph-ansible/ceph-base.yaml index 3ef4754bbe..e6fb2eed39 100644 --- a/docker/services/ceph-ansible/ceph-base.yaml +++ b/docker/services/ceph-ansible/ceph-base.yaml @@ -187,7 +187,7 @@ outputs: workflow_tasks: step2: - name: ceph_base_ansible_workflow - workflow: { get_param: CephAnsibleWorkflowName } + workflow: {get_param: CephAnsibleWorkflowName} input: ansible_skip_tags: {get_param: CephAnsibleSkipTags} ceph_ansible_extra_vars: {get_param: CephAnsibleExtraConfig}