Revert "[patch] Backport proposed generate_dhparams fix"

This reverts commit c7dff6e1ae6444f60d3fe20b1f495609c7980051.
The patch has been merged into upstream.

Change-Id: Idf768b9b94b3498994601d50feeeef008430ba27
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>

1 files changed, 0 insertions, 41 deletions

diff --git a/mcp/patches/0001-server-Fix-generate_dhparams-j2-var-manipulation.patch b/mcp/patches/0001-server-Fix-generate_dhparams-j2-var-manipulation.patch
deleted file mode 100644
index f2141862c..000000000
--- a/mcp/patches/0001-server-Fix-generate_dhparams-j2-var-manipulation.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2018 Mirantis Inc., Enea AB and others.
-:
-: All rights reserved. This program and the accompanying materials
-: are made available under the terms of the Apache License, Version 2.0
-: which accompanies this distribution, and is available at
-: http://www.apache.org/licenses/LICENSE-2.0
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Tue, 22 May 2018 19:56:47 +0200
-Subject: [PATCH] server: Fix generate_dhparams j2 var manipulation
-
-Fixes: 621ee472
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- nginx/server.sls | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/nginx/server.sls b/nginx/server.sls
-index 79287c4..f8c9305 100644
---- a/nginx/server.sls
-+++ b/nginx/server.sls
-@@ -78,14 +78,14 @@ nginx_service:
-   - require:
-     - pkg: nginx_packages
-
--{%- set generate_dhparams = False %}
-+{%- set generate_dhparams = { 'enabled': False } %}
- {%- for site_name, site in server.get('site', {}).iteritems() %}
- {%- if site.get('ssl', {}).get('enabled') and site.ssl.get('mode', 'secure') == 'secure' %}
--  {%- set generate_dhparams = True %}
-+  {%- do generate_dhparams.update({ 'enabled': True }) %}
- {%- endif %}
- {%- endfor %}
-
--{%- if generate_dhparams %}
-+{%- if generate_dhparams['enabled'] %}
- nginx_generate_dhparams:
-   cmd.run:
-   - name: openssl dhparam -out /etc/ssl/dhparams.pem 2048