commit 58161efb67740f33e8aa82f7ac31dc4c269a7e2a
author Michael Polenchuk <mpolenchuk@mirantis.com> Tue May 15 18:04:09 2018 +0400
committer Michael Polenchuk <mpolenchuk@mirantis.com> Mon Sep 24 16:09:34 2018 +0400
tree fa0ee8355df2ee6068a8cab35122e1b18e977344
parent 1a453ae4d443e5315e76956ad5bb70dfbb26f05f

Bring in OVN metadata agent

Change-Id: I6bf172b47c6838811f6b485cfe1da65d8a0f6170

tests/pillar/compute_ovn.sls

diff --git a/tests/pillar/compute_ovn.sls b/tests/pillar/compute_ovn.sls
index 0f4b580..487faa3 100644
--- a/tests/pillar/compute_ovn.sls
+++ b/tests/pillar/compute_ovn.sls
@@ -1,9 +1,23 @@
 neutron:
   compute:
     enabled: true
-    version: ocata
+    version: queens
     local_ip: 10.2.0.105
     controller_vip: 10.1.0.101
     external_access: false
     backend:
       engine: ovn
+      ovsdb_connection: tcp:127.0.0.1:6640
+    metadata:
+      enabled: true
+      ovsdb_server_iface: ptcp:6640:127.0.0.1
+      host: 10.1.0.101
+      password: unsegreto
+linux:
+  system:
+    enabled: true
+    repo:
+      mirantis_openstack_queens:
+        source: "deb http://mirror.fuel-infra.org/mcp-repos/queens/xenial queens main"
+        architectures: amd64
+        key_url: "http://mirror.fuel-infra.org/mcp-repos/queens/xenial/archive-mcpqueens.key"

tests/pillar/control_ovn.sls

diff --git a/tests/pillar/control_ovn.sls b/tests/pillar/control_ovn.sls
index 9d4794b..f5348fa 100644
--- a/tests/pillar/control_ovn.sls
+++ b/tests/pillar/control_ovn.sls
@@ -1,7 +1,7 @@
 neutron:
   server:
     enabled: true
-    version: ocata
+    version: queens
     api_workers: 2
     rpc_workers: 2
     rpc_state_report_workers: 2
@@ -15,6 +15,7 @@
       ovn:
         ovn_l3_scheduler: chance
         neutron_sync_mode: off
+        metadata_enabled: true
     controller_vip: 172.16.10.101
     dvr: false
     l3_ha: false
@@ -60,7 +61,7 @@
   system:
     enabled: true
     repo:
-      mirantis_openstack_ocata:
-        source: "deb http://mirror.fuel-infra.org/mcp-repos/ocata/xenial ocata main"
+      mirantis_openstack_queens:
+        source: "deb http://mirror.fuel-infra.org/mcp-repos/queens/xenial queens main"
         architectures: amd64
-        key_url: "http://mirror.fuel-infra.org/mcp-repos/ocata/xenial/archive-mcpocata.key"
+        key_url: "http://mirror.fuel-infra.org/mcp-repos/queens/xenial/archive-mcpqueens.key"