Merge "Fixes duplicate mailgun section in poppy.conf Readd retry_send…

…=5, as it wasn't in the top section"

etc/poppy.conf

@@ -147,6 +147,7 @@ mailgun_request_url = "https://api.mailgun.net/v2/{0}/events"
 sand_box = "<your_sand_box_domain>"
 from_address = "<your_send_from_email_address>"
 recipients="<a_list_of_email_recipient>"
+retry_send=5
 
 [drivers:provider:fastly]
 apikey = "MYAPIKEY"
@@ -226,14 +227,6 @@ queue_backend_port = <your_transport_port>
 mod_san_queue_path = '/mod_san_queue'
 san_mapping_queue_path = '/san_mapping_queue'
 
-[drivers:notification:mailgun]
-mailgun_api_key = "<operator_api_key>"
-mailgun_request_url = "https://api.mailgun.net/v2/{0}/events"
-sand_box = "<your_sand_box_domain>"
-from_address = "<your_send_from_email_address>"
-recipients="<a_list_of_email_recipient>"
-retry_send=5
-
 [log_delivery]
 identity_url = OPENSTACK_IDENTITY_URL
 preferred_dcs = DC1,DC2