commit 569d5dccc5d34d6553e1f32da1b19d249661b35b
author Ales Komarek <akomarek@mirantis.com> Fri Jun 30 11:36:44 2017 +0000
committer Gerrit Code Review <gerrit2@32a4cf582fa9> Fri Jun 30 11:36:47 2017 +0000
tree 637199990e1269333c38fec887d018360d688459
parent a045e8ef192b5a729e25c616cade70c2b0ad0761
parent b606a780a9b0ada6eb841f9f957e088bab5062d8

Merge "Create amphora flavor for Octavia"

keystone/client/service/octavia.yml

diff --git a/keystone/client/service/octavia.yml b/keystone/client/service/octavia.yml
index 819cd79..4e14217 100644
--- a/keystone/client/service/octavia.yml
+++ b/keystone/client/service/octavia.yml
@@ -28,3 +28,11 @@
                 admin_address: ${_param:octavia_service_host}
                 admin_port: 9876
                 admin_path: '/'
+        octavia_identity:
+          admin:
+            user: octavia
+            password: ${_param:keystone_octavia_password}
+            project: service
+            host: ${_param:keystone_service_host}
+            port: 5000
+            region_name: ${_param:openstack_region}

nova/client/service/octavia.yml

diff --git a/nova/client/service/octavia.yml b/nova/client/service/octavia.yml
new file mode 100644
index 0000000..817297f
--- /dev/null
+++ b/nova/client/service/octavia.yml
@@ -0,0 +1,13 @@
+parameters:
+  nova:
+    client:
+      enabled: true
+      server:
+        octavia_identity:
+          endpoint_type: internalURL
+          flavor:
+            m1.amphora:
+              flavor_id: ${_param:amp_flavor_id}
+              ram: 1024
+              disk: 2
+              vcpus: 1