commit 9e97de7987d47b9debed309425a146098a6c1b20
author Elena Ezhova <eezhova@mirantis.com> Tue Jul 18 16:12:55 2017 +0400
committer Elena Ezhova <eezhova@mirantis.com> Wed Jul 19 12:51:49 2017 +0400
tree 19b7bbeae93962d4df8033690e0b7dcd55dab866
parent efe93679079cdb32ccb422c48a8f0d4ed6dcbacf

Update SSL metadata

- Don't require encrypting CA private key
- Add parameter specifying CA private key name
- Add parameter specifying client cert all file name
- Remove unneeded certificate parameters for API config and metadata

Depends on: https://gerrit.mcp.mirantis.net/7678
Related PROD: PROD-11933

Change-Id: Ieba4f680bff3ad992ec5372d4296fc5bc997e8ba

tests/pillar/manager_single.sls

diff --git a/tests/pillar/manager_single.sls b/tests/pillar/manager_single.sls
index 4ded26b..2087332 100644
--- a/tests/pillar/manager_single.sls
+++ b/tests/pillar/manager_single.sls
@@ -25,7 +25,6 @@
       password: password
       virtual_host: '/openstack'
     certificates:
-      ca_private_key_passphrase: foobar
       ca_private_key: '/etc/octavia/certs/private/cakey.pem'
       ca_certificate: '/etc/octavia/certs/ca_01.pem'
     controller_worker:
@@ -35,6 +34,8 @@
       loadbalancer_topology: 'SINGLE'
     haproxy_amphora:
       client_cert: '/etc/octavia/certs/client.pem'
+      client_cert_key: '/etc/octavia/certs/client.key'
+      client_cert_all: '/etc/octavia/certs/client_all.pem'
       server_ca: '/etc/octavia/certs/ca_01.pem'
     health_manager:
       bind_ip: 192.168.0.12