Merge "NetworkDeploymentActions shall be made role specific"

puppet/role.role.j2.yaml

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