From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Wed, 26 Sep 2018 08:17:11 +0000 (+0400)
Subject: [ovn] Enable metadata agent
X-Git-Tag: opnfv-8.0.0~131^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=637e149c0af5ef96612846bf9f0b3482ce11fc5b;p=fuel.git

[ovn] Enable metadata agent

Change-Id: I9ef3a1dd570abf90b222609af350565d385326c8
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
---

diff --git a/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch b/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch
index a802bdcc8..07694c1ac 100644
--- a/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch
+++ b/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch
@@ -33,7 +33,7 @@ index 2c75586..d7d4c49 100644
      ARG RECLASS_BASE="/srv/salt/reclass"
      ENV RECLASS_BASE $RECLASS_BASE
 -    RUN echo "Layer python/salt module prerequisites, formulas" \
-+    RUN echo "Layer python/salt module prerequisites, formulas (25 Sep 2018)" \
++    RUN echo "Layer python/salt module prerequisites, formulas (26 Sep 2018)" \
        && mkdir -p /srv/salt \
        && curl -sSqL https://raw.githubusercontent.com/salt-formulas/salt-formulas-scripts/master/formula-fetch.sh -o /srv/salt/formula-fetch.sh \
        && bash -c 'source /srv/salt/formula-fetch.sh && setupPyEnv && fetchAll' \
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