Mend OVN scenario

* setup HWE kernel to get suitable conntrack module
* clean out outdated state with ovn ctl options
* point SB remote source to local mgmt network

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

4 files changed, 4 insertions, 16 deletions

diff --git a/mcp/config/scenario/defaults.yaml b/mcp/config/scenario/defaults.yaml
index e6915d468..13f2dd527 100644
--- a/mcp/config/scenario/defaults.yaml
+++ b/mcp/config/scenario/defaults.yaml
@@ -20,6 +20,7 @@ x86_64:
         - saltstack 500 deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11 xenial main
     pkg:
       install:
+        - linux-generic-hwe-16.04
         - salt-minion
   control:
     apt: ~
diff --git a/mcp/config/scenario/os-ovn-nofeature-noha.yaml b/mcp/config/scenario/os-ovn-nofeature-noha.yaml
index 0e4d644d7..104df96d3 100644
--- a/mcp/config/scenario/os-ovn-nofeature-noha.yaml
+++ b/mcp/config/scenario/os-ovn-nofeature-noha.yaml
@@ -10,7 +10,6 @@ cluster:
   domain: mcp-pike-ovn-noha.local
   states:
     - openstack_noha
-    - ovn_ctl_opts
     - networks
 virtual:
   nodes:
diff --git a/mcp/config/states/ovn_ctl_opts b/mcp/config/states/ovn_ctl_opts
deleted file mode 100755
index eeb336b28..000000000
--- a/mcp/config/states/ovn_ctl_opts
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash -e
-##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x
-
-salt -I 'neutron:server' file.append /etc/default/ovn-central \
-  args="OVN_CTL_OPTS='--db-nb-create-insecure-remote=yes --db-sb-create-insecure-remote=yes'"
-salt -I 'neutron:server' service.restart ovn-central
-sleep 30
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovn-noha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-pike-ovn-noha/openstack/compute.yml
index 92db55c58..ad8658518 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-ovn-noha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovn-noha/openstack/compute.yml
@@ -11,6 +11,9 @@ classes:
   - cluster.mcp-pike-common-noha.openstack_compute
   - cluster.mcp-pike-ovn-noha
 parameters:
+  neutron:
+    compute:
+      controller_vip: ${_param:cluster_local_address}
   linux:
     network:
       interface: