commit 02f67bb5faaf7fb85a1387cc7c7b4d363884acd3
author mcp-jenkins <mcp-jenkins@mirantis.com> Thu Aug 23 12:29:26 2018 +0000
committer Gerrit Code Review <gerrit2@84b5d06f6116> Thu Aug 23 12:29:26 2018 +0000
tree f68e06314b2395569f20e8b51a6d37d1a399a2ba
parent c57d01895e5cb6f53e742fbc309d00d9774ecb57
parent 561c7e5b4883e6cf0e76276d0d05955ae76450aa

Merge "Fix octavia ca/cert generation"

salt/minion/ca/octavia_ca.yml

diff --git a/salt/minion/ca/octavia_ca.yml b/salt/minion/ca/octavia_ca.yml
index 453c450..e6e0ae0 100644
--- a/salt/minion/ca/octavia_ca.yml
+++ b/salt/minion/ca/octavia_ca.yml
@@ -27,7 +27,5 @@
           days_valid:
             authority: ${_param:octavia_ca_days_valid_authority}
             certificate: ${_param:octavia_ca_days_valid_certificate}
-          ca_file: ${octavia:manager:certificates:ca_certificate}
-          ca_key_file: ${octavia:manager:certificates:ca_private_key}
           user: octavia
           group: octavia