openstack/tripleo-heat-templates
Code Issues Proposed changes

Rename service_workflow_tasks into workflow_tasks

Browse Source 
Using the service_ prefix seems incoherent with its use in
service_config_settings (vs config_settings).

Change-Id: Ia39f181415bee0071409dabddfa0c5c312915e1f
This commit is contained in:
Giulio Fidente 2017-09-12 22:29:13 +02:00
parent 3dcc9b30e9
commit 09137304b9
12 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/deploy-steps.j2
View File

@ -63,7 +63,7 @@ conditions:
{%- for role in enabled_roles %}
- not:
equals:
- get_param: [role_data, {{role.name}}, service_workflow_tasks, step{{step}}]
- get_param: [role_data, {{role.name}}, workflow_tasks, step{{step}}]
- ''
- False
{%- endfor %}
@ -95,7 +95,7 @@ resources:
_TASKS: {get_file: deploy-steps-tasks.yaml}
{%- for step in range(1, deploy_steps_max) %}
# BEGIN service_workflow_tasks handling
# BEGIN workflow_tasks handling
WorkflowTasks_Step{{step}}:
type: OS::Mistral::Workflow
condition: WorkflowTasks_Step{{step}}_Enabled
@ -111,7 +111,7 @@ resources:
{%- endfor %}
{%- endif %}
properties:
name: {list_join: [".", ["tripleo", {get_param: stack_name}, "workflowtasks", "step{{step}}"]]}
name: {list_join: [".", ["tripleo", {get_param: stack_name}, "workflow_tasks", "step{{step}}"]]}
type: direct
tags:
- tripleo-heat-templates-managed
@ -121,7 +121,7 @@ resources:
expression: $.data.where($ != '').select($.get('step{{step}}')).where($ != null).flatten()
data:
{%- for role in enabled_roles %}
- get_param: [role_data, {{role.name}}, service_workflow_tasks]
- get_param: [role_data, {{role.name}}, workflow_tasks]
{%- endfor %}
WorkflowTasks_Step{{step}}_Execution:
@ -151,7 +151,7 @@ resources:
{%- endfor %}
evaluate_env: false
always_update: true
# END service_workflow_tasks handling
# END workflow_tasks handling
{% endfor %}
# Artifacts config and HostPrepConfig is done on all roles, not only

6
common/services.yaml
View File

@ -174,13 +174,13 @@ resources:
expression: coalesce($.data.role_data, []).where($ != null).select($.get('service_config_settings')).where($ != null).reduce($1.mergeWith($2), {})
data: {role_data: {get_attr: [ServiceChain, role_data]}}
ServiceWorkflowTasks:
WorkflowTasks:
type: OS::Heat::Value
properties:
type: json
value:
yaql:
expression: coalesce($.data.role_data, []).where($ != null).select($.get('service_workflow_tasks')).where($ != null).reduce($1.mergeWith($2), {})
expression: coalesce($.data.role_data, []).where($ != null).select($.get('workflow_tasks')).where($ != null).reduce($1.mergeWith($2), {})
data: {role_data: {get_attr: [ServiceChain, role_data]}}
UpgradeTasks:
@ -260,7 +260,7 @@ outputs:
config_settings: {map_merge: {get_attr: [ServiceChain, role_data, config_settings]}}
global_config_settings: {get_attr: [GlobalConfigSettings, value]}
service_config_settings: {get_attr: [ServiceConfigSettings, value]}
service_workflow_tasks: {get_attr: [ServiceWorkflowTasks, value]}
workflow_tasks: {get_attr: [WorkflowTasks, value]}
step_config: {get_attr: [PuppetStepConfig, value]}
upgrade_tasks: {get_attr: [UpgradeTasks, value]}
update_tasks: {get_attr: [UpdateTasks, value]}

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

@ -182,7 +182,7 @@ outputs:
config_volume: ''
step_config: ''
docker_config: {}
service_workflow_tasks:
workflow_tasks:
step2:
- name: ceph_base_ansible_workflow
workflow: { get_param: CephAnsibleWorkflowName }

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

@ -54,5 +54,5 @@ outputs:
config_volume: ''
step_config: ''
docker_config: {}
service_workflow_tasks: {get_attr: [CephBase, role_data, service_workflow_tasks]}
workflow_tasks: {get_attr: [CephBase, role_data, workflow_tasks]}
config_settings: {}

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

@ -58,7 +58,7 @@ outputs:
config_volume: ''
step_config: ''
docker_config: {}
service_workflow_tasks: {get_attr: [CephBase, role_data, service_workflow_tasks]}
workflow_tasks: {get_attr: [CephBase, role_data, workflow_tasks]}
config_settings:
ceph_client_ansible_vars:
map_merge:

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

@ -68,7 +68,7 @@ outputs:
config_volume: ''
step_config: ''
docker_config: {}
service_workflow_tasks: {get_attr: [CephBase, role_data, service_workflow_tasks]}
workflow_tasks: {get_attr: [CephBase, role_data, workflow_tasks]}
config_settings:
map_merge:
- tripleo.ceph_mds.firewall_rules:

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

@ -71,7 +71,7 @@ outputs:
config_volume: ''
step_config: ''
docker_config: {}
service_workflow_tasks: {get_attr: [CephBase, role_data, service_workflow_tasks]}
workflow_tasks: {get_attr: [CephBase, role_data, workflow_tasks]}
config_settings:
map_merge:
- tripleo.ceph_mon.firewall_rules:

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

@ -63,7 +63,7 @@ outputs:
config_volume: ''
step_config: ''
docker_config: {}
service_workflow_tasks: {get_attr: [CephBase, role_data, service_workflow_tasks]}
workflow_tasks: {get_attr: [CephBase, role_data, workflow_tasks]}
config_settings:
map_merge:
- tripleo.ceph_osd.firewall_rules:

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

@ -62,7 +62,7 @@ outputs:
config_volume: ''
step_config: ''
docker_config: {}
service_workflow_tasks: {get_attr: [CephBase, role_data, service_workflow_tasks]}
workflow_tasks: {get_attr: [CephBase, role_data, workflow_tasks]}
config_settings:
map_merge:
- tripleo.ceph_rgw.firewall_rules:

4
puppet/services/README.rst
View File

@ -99,12 +99,12 @@ It is also possible to use Mistral actions or workflows together with
a deployment step, these are executed before the main configuration run.
To describe actions or workflows from within a service use:
* service_workflow_tasks: One or more workflow task properties
* workflow_tasks: One or more workflow task properties
which expects a map where the key is the step and the value a list of
dictionaries descrbing each a workflow task, for example::
service_workflow_tasks:
workflow_tasks:
step2:
- name: echo
action: std.echo output=Hello

0
releasenotes/notes/service_workflow_tasks-4da5830821b7154b.yaml → releasenotes/notes/workflow_tasks-4da5830821b7154b.yaml
View File

2
tools/yaml-validate.py
View File

@ -40,7 +40,7 @@ envs_containing_endpoint_map = ['tls-endpoints-public-dns.yaml',
'tls-endpoints-public-ip.yaml',
'tls-everywhere-endpoints-dns.yaml']
ENDPOINT_MAP_FILE = 'endpoint_map.yaml'
OPTIONAL_SECTIONS = ['service_workflow_tasks']
OPTIONAL_SECTIONS = ['workflow_tasks']
REQUIRED_DOCKER_SECTIONS = ['service_name', 'docker_config', 'puppet_config',
'config_settings', 'step_config']
OPTIONAL_DOCKER_SECTIONS = ['docker_puppet_tasks', 'upgrade_tasks',