commit b2c72eff59cdc893ca91787887cdd1ab0ff18021
author Ann Taraday <akamyshnikova@mirantis.com> Mon Dec 10 17:01:02 2018 +0400
committer Anna Taraday <akamyshnikova@mirantis.com> Tue Dec 11 07:20:51 2018 +0000
tree 30b78c443ec31c58933d20981991809fc9a40ef0
parent d7bb4506bded6c85a3589d682a2baf72dee82f1c

[Octavia] Remove extra changes

Change-Id: I629841d1b23f657c8a087a4b554dc26327184a50

classes/cluster/virtual-mcp11-aio-octavia/init.yml

diff --git a/classes/cluster/virtual-mcp11-aio-octavia/init.yml b/classes/cluster/virtual-mcp11-aio-octavia/init.yml
index 5be1752..2b98900 100755
--- a/classes/cluster/virtual-mcp11-aio-octavia/init.yml
+++ b/classes/cluster/virtual-mcp11-aio-octavia/init.yml
@@ -3,10 +3,3 @@
 - cluster.virtual-mcp11-aio-octavia.openstack.octavia_manager
 - cluster.virtual-mcp11-aio
 - cluster.overrides
-
-parameters:
-  salt:
-    minion:
-      cert:
-        octavia_amp_client:
-          ca_file: '/etc/octavia/certs/ca_01.pem'

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 1db3e22..7557fbe 100644
--- a/classes/cluster/virtual-mcp11-aio-octavia/openstack/octavia_manager.yml
+++ b/classes/cluster/virtual-mcp11-aio-octavia/openstack/octavia_manager.yml
@@ -33,7 +33,3 @@
       eULAsTn0btoxcPLLh+lv2jYhBH+ygF0Aa7lUgK+raFTkngeTTN4TTw==
       -----END RSA PRIVATE KEY-----
 
-  octavia:
-      manager:
-        certificates:
-          ca_certificate: '/etc/pki/ca/octavia_ca/ca.crt'