openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "NetworkDeploymentActions shall be made role specific"

This commit is contained in:
Jenkins 2017-09-01 11:21:14 +00:00 committed by Gerrit Code Review
parent 3b106dd308 88711c3b80
commit 5702d7c2ed
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
puppet/role.role.j2.yaml
View File

@ -105,6 +105,11 @@ parameters:
description: DEPRECATED - use {{role.name}}IPs instead description: DEPRECATED - use {{role.name}}IPs instead
type: json type: json
{%- endif %} {%- endif %}
{{role.name}}NetworkDeploymentActions:
type: comma_delimited_list
description: >
Heat action when to apply network configuration changes
default: []
NetworkDeploymentActions: NetworkDeploymentActions:
type: comma_delimited_list type: comma_delimited_list
description: > description: >
@ -265,6 +270,11 @@ conditions:
- {get_param: {{role.deprecated_param_flavor}}} - {get_param: {{role.deprecated_param_flavor}}}
- {{default_flavor_name}} - {{default_flavor_name}}
{%- endif %} {%- endif %}
role_network_deployment_actions_exists:
not:
equals:
- {get_param: {{role.name}}NetworkDeploymentActions}
- []
resources: resources:
{{server_resource_name}}: {{server_resource_name}}:
@ -490,7 +500,10 @@ resources:
actions: actions:
if: if:
- server_not_blacklisted - server_not_blacklisted
- {get_param: NetworkDeploymentActions} - if:
- role_network_deployment_actions_exists
- {get_param: {{role.name}}NetworkDeploymentActions}
- {get_param: NetworkDeploymentActions}
- [] - []
{{server_resource_name}}UpgradeInitConfig: {{server_resource_name}}UpgradeInitConfig: