Merge "Add ServerDeletionPolicy parameter"

puppet/role.role.j2.yaml

@@ -245,6 +245,13 @@ parameters:
     default: 15
     type: number
 
+  ServerDeletionPolicy:
+    description: Whether to retain or delete servers on deletion of the stack
+    type: string
+    default: delete
+    constraints:
+      - allowed_values: [delete, retain]
+
 {% if role.uses_deprecated_params|default(false) %}
 parameter_groups:
 - label: deprecated
@@ -312,6 +319,7 @@ conditions:
 resources:
   {{server_resource_name}}:
     type: OS::TripleO::{{role.name}}Server
+    deletion_policy: {get_param: ServerDeletionPolicy}
     metadata:
       os-collect-config:
         command: {get_param: ConfigCommand}