From 637e149c0af5ef96612846bf9f0b3482ce11fc5b Mon Sep 17 00:00:00 2001
From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Wed, 26 Sep 2018 12:17:11 +0400
Subject: [ovn] Enable metadata agent

Change-Id: I9ef3a1dd570abf90b222609af350565d385326c8
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
---
 mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/compute.yml      | 3 +++
 mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/control.yml      | 2 ++
 mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/compute.yml.j2 | 1 +
 mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/control.yml    | 6 ++++++
 4 files changed, 12 insertions(+)

(limited to 'mcp/reclass/classes/cluster')

diff --git a/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/compute.yml
index ec3cfaf21..658f8fafa 100644
--- a/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/compute.yml
@@ -16,3 +16,6 @@ parameters:
     compute:
       libvirt_service: libvirtd
       libvirt_bin: /etc/default/libvirtd
+  neutron:
+    gateway:
+      ~message_queue: ~
diff --git a/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/control.yml
index 64c16f031..94ca6ebb8 100644
--- a/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/control.yml
@@ -33,6 +33,8 @@ parameters:
         mechanism:
           ovn:
             driver: ovn
+        ovn:
+          metadata_enabled: true
       compute:
         region: ${_param:openstack_region}
       database:
diff --git a/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/compute.yml.j2 b/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/compute.yml.j2
index 02411cd2c..da1b98865 100644
--- a/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/compute.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/compute.yml.j2
@@ -17,6 +17,7 @@ parameters:
   neutron:
     compute:
       controller_vip: ${_param:cluster_local_address}
+      ~message_queue: ~
   linux:
     network:
       interface:
diff --git a/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/control.yml
index 235beff26..f99a460bd 100644
--- a/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/control.yml
@@ -10,3 +10,9 @@ classes:
   - system.neutron.control.ovn.single
   - cluster.mcp-common-noha.openstack_control
   - cluster.mcp-ovn-noha
+parameters:
+  neutron:
+    server:
+      backend:
+        ovn:
+          metadata_enabled: true
-- 
cgit 1.2.3-korg