commit c11ee58a469544f3b7ff190219a9122f5e19daf2
author Ann Taraday <akamyshnikova@mirantis.com> Mon Dec 24 11:54:24 2018 +0400
committer Ann Taraday <akamyshnikova@mirantis.com> Mon Dec 24 11:54:24 2018 +0400
tree 796bc81c3ecb45efd0a0b1843e4ee96a32ba5041
parent 010b86c7e2860c62fc98aa0c27e2f682aaf59ac5

[Octavia] Remove exta change

Change Idc5b1ce6e88c9afdeb35783f578acfab519a886b got merged
so extra setting can be removed from model.

Change-Id: I7c92f57e9d7e6143249dee9ce3f181baa4fc8164
Related-PROD: PROD-25309

classes/cluster/virtual-mcp11-aio-octavia/openstack/octavia_manager.yml

diff --git a/classes/cluster/virtual-mcp11-aio-octavia/openstack/octavia_manager.yml b/classes/cluster/virtual-mcp11-aio-octavia/openstack/octavia_manager.yml
index 5eb715f..8fb5af4 100644
--- a/classes/cluster/virtual-mcp11-aio-octavia/openstack/octavia_manager.yml
+++ b/classes/cluster/virtual-mcp11-aio-octavia/openstack/octavia_manager.yml
@@ -31,14 +31,3 @@
       FWC50XnPUbcpMwOZq9ibf/ZDHYo5NIxdbLkHG2Aw5ssPF2NFqRO8m+aST73fjoCL
       eULAsTn0btoxcPLLh+lv2jYhBH+ygF0Aa7lUgK+raFTkngeTTN4TTw==
       -----END RSA PRIVATE KEY-----
-  octavia:
-    # TODO remove these classes when https://gerrit.mcp.mirantis.com/#/c/32227/ got merged
-    manager:
-      certificates:
-        ca_private_key: /srv/salt/env/${_param:salt_master_base_environment}/_certs/octavia/ca.key
-        ca_certificate: /srv/salt/env/${_param:salt_master_base_environment}/_certs/octavia/ca_01.pem
-      haproxy_amphora:
-        client_cert: /srv/salt/env/${_param:salt_master_base_environment}/_certs/octavia/client.pem
-        client_cert_key: /srv/salt/env/${_param:salt_master_base_environment}/_certs/octavia/client.key
-        client_cert_all: /srv/salt/env/${_param:salt_master_base_environment}/_certs/octavia/client_all.pem
-        server_ca: /srv/salt/env/${_param:salt_master_base_environment}/_certs/octavia/ca_01.pem
\ No newline at end of file