commit 0a508a3540ad1a388b91723626b926d29502c36f
author Jakub Josef <jjosef@mirantis.com> Mon Aug 07 12:37:42 2017 +0000
committer Gerrit Code Review <gerrit2@980ef0291b9e> Mon Aug 07 12:37:46 2017 +0000
tree 62ccd3421ba162d233b722e52af1dfd00ef09bf6
parent 4c934c48285f8f3d0a71b1ff5ba5e341a25b6943
parent e4452bb0b629c8fd0c720c86fdddfeac7a8561eb

Merge "Update SSH key management for Octavia"

nova/client/service/octavia.yml

diff --git a/nova/client/service/octavia.yml b/nova/client/service/octavia.yml
index e0b6557..e31fde3 100644
--- a/nova/client/service/octavia.yml
+++ b/nova/client/service/octavia.yml
@@ -1,8 +1,6 @@
 classes:
 - service.nova.client
 parameters:
-  _param:
-    octavia_ssh_key_path: "/etc/octavia/.ssh/octavia_ssh_key.pub"
   nova:
     client:
       server:
@@ -18,4 +16,4 @@
           endpoint_type: internalURL
           keypair:
             octavia_ssh_key:
-              pub_file: ${_param:octavia_ssh_key_path}
+              pub_key: ${_param:octavia_public_key}

octavia/manager/single.yml

diff --git a/octavia/manager/single.yml b/octavia/manager/single.yml
index a7bc7a9..acab136 100644
--- a/octavia/manager/single.yml
+++ b/octavia/manager/single.yml
@@ -5,3 +5,7 @@
     manager:
       enabled: true
       version: ${_param:octavia_version}
+      ssh:
+        private_key: ${_param:octavia_private_key}
+        user: octavia
+        group: octavia