Merge "Allow configuration of the managed resource email address"

deployment/designate/designate-central-container-puppet.yaml

@@ -61,6 +61,11 @@ parameters:
     description: The password for the Designate's database account.
     type: string
     hidden: true
+  DesignateManagedResourceEmail:
+    description: Configure email address to be set in zone SOAs. Leaving
+                 unset results in service defaults being used.
+    type: string
+    default: ''
 
 conditions:
   designate_workers_set:
@@ -68,6 +73,8 @@ conditions:
   designate_min_ttl_set:
     not: {equals : [{get_param: DesignateMinTTL}, 0]}
   enable_sqlalchemy_collectd: {equals : [{get_param: EnableSQLAlchemyCollectd}, true]}
+  designate_resource_email_set :
+    not: {equals : [{get_param: DesignateManagedResourceEmail}, '']}
 
 resources:
 
@@ -123,7 +130,9 @@ outputs:
               if:
                 - designate_min_ttl_set
                 - {get_param: DesignateMinTTL}
-
+          - if:
+            - designate_resource_email_set
+            - designate::central::managed_resource_email: {get_param: DesignateManagedResourceEmail}
       service_config_settings:
         mysql:
           designate::db::mysql::password: {get_param: DesignatePassword}