[SSL] Sync new options for apache and nginx
Set the same options via apache[nginx]/files/_ssl.conf template for sites as
they were set by apache[nginx]/files/_ssl_secure.conf (deprecated) earlier.
By default the same set of ciphers was set in nginx and apache in _ssl_secure.conf
Now the same list of ciphers is set through pillar.
Change-Id: I64b6bfe0cbb23d204a50c6bde8d9de6ed6fac306
Related-Prod: https://mirantis.jira.com/browse/PROD-20921
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/proxy.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/proxy.yml
index 6c1a501..66a310a 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/proxy.yml
@@ -3,6 +3,7 @@
- system.nginx.server.proxy.openstack_api
- system.nginx.server.proxy.openstack_vnc
- system.nginx.server.proxy.openstack_web
+- system.nginx.server.proxy.ssl
- system.salt.minion.cert.proxy
- cluster.virtual-mcp-pike-dvr-ssl-barbican
parameters:
@@ -11,8 +12,6 @@
nginx_proxy_ssl:
enabled: true
authority: ${_param:salt_minion_ca_authority}
- engine: salt
- mode: secure
salt_minion_ca_host: cfg01.${linux:system:domain}
nginx:
server: