commit 122d01940e68e052550618799ec7908d549f74aa
author Tomas Kukral <tkukral@mirantis.com> Mon Jul 17 13:58:49 2017 +0000
committer Gerrit Code Review <gerrit2@32a4cf582fa9> Mon Jul 17 13:58:51 2017 +0000
tree 9c80e59a53e17777b41464a3ab917f34b6e70e03
parent cfa2a535fefaa71cabfb0104b3e71c2d38fe6289
parent 9a21dc4dc26322d30ef2eea1561b427150466126

Merge "Add Nova client metadata to create Octavia keypair"

nova/client/service/octavia.yml

diff --git a/nova/client/service/octavia.yml b/nova/client/service/octavia.yml
index 817297f..e0b6557 100644
--- a/nova/client/service/octavia.yml
+++ b/nova/client/service/octavia.yml
@@ -1,9 +1,12 @@
+classes:
+- service.nova.client
 parameters:
+  _param:
+    octavia_ssh_key_path: "/etc/octavia/.ssh/octavia_ssh_key.pub"
   nova:
     client:
-      enabled: true
       server:
-        octavia_identity:
+        admin_identity:
           endpoint_type: internalURL
           flavor:
             m1.amphora:
@@ -11,3 +14,8 @@
               ram: 1024
               disk: 2
               vcpus: 1
+        octavia_identity:
+          endpoint_type: internalURL
+          keypair:
+            octavia_ssh_key:
+              pub_file: ${_param:octavia_ssh_key_path}