summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-04-24 14:26:40 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-04-24 14:26:40 +0000
commit58aa624bbe7d26ec23986b78f9ba59bafa7666ab (patch)
tree721ed096606f5875b27c7f97c5ac8a9bf26698d6
parent0a86dbb986bc0c22fae07dc489c21ce185a5540b (diff)
parent26ca4c20b57564117087e2c649e10d71477a134f (diff)
Merge "Mend OVN scenario"
-rw-r--r--mcp/config/scenario/defaults.yaml1
-rw-r--r--mcp/config/scenario/os-ovn-nofeature-noha.yaml1
-rwxr-xr-xmcp/config/states/ovn_ctl_opts15
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-ovn-noha/openstack/compute.yml3
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: