aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/config
diff options
context:
space:
mode:
Diffstat (limited to 'mcp/config')
-rw-r--r--mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml1
-rw-r--r--mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml1
-rw-r--r--mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml1
-rw-r--r--mcp/config/scenario/virtual/os-ovn-nofeature-noha.yaml29
-rwxr-xr-xmcp/config/states/neutron_gateway12
-rwxr-xr-xmcp/config/states/openstack_noha1
6 files changed, 44 insertions, 1 deletions
diff --git a/mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml b/mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml
index 57369a906..b35e66fc7 100644
--- a/mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml
+++ b/mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml
@@ -10,6 +10,7 @@ cluster:
domain: virtual-mcp-pike-ovs-noha.local
states:
- openstack_noha
+ - neutron_gateway
- neutron_compute
- networks
virtual:
diff --git a/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml b/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml
index 7be0fd82a..e3cd3dbd9 100644
--- a/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml
+++ b/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml
@@ -11,6 +11,7 @@ cluster:
states:
- dpdk
- openstack_noha
+ - neutron_gateway
- neutron_compute
- networks
virtual:
diff --git a/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml b/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml
index 5d114ed72..cef41270c 100644
--- a/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml
+++ b/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml
@@ -11,6 +11,7 @@ cluster:
states:
- opendaylight
- openstack_noha
+ - neutron_gateway
- networks
virtual:
nodes:
diff --git a/mcp/config/scenario/virtual/os-ovn-nofeature-noha.yaml b/mcp/config/scenario/virtual/os-ovn-nofeature-noha.yaml
new file mode 100644
index 000000000..d69f978fc
--- /dev/null
+++ b/mcp/config/scenario/virtual/os-ovn-nofeature-noha.yaml
@@ -0,0 +1,29 @@
+##############################################################################
+# 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
+##############################################################################
+---
+cluster:
+ domain: virtual-mcp-pike-ovn-noha.local
+ states:
+ - openstack
+ - neutron_compute
+ - networks
+virtual:
+ nodes:
+ - cfg01
+ - ctl01
+ - cmp01
+ - cmp02
+ ctl01:
+ vcpus: 4
+ ram: 14336
+ cmp01:
+ vcpus: 4
+ ram: 8192
+ cmp02:
+ vcpus: 4
+ ram: 8192
diff --git a/mcp/config/states/neutron_gateway b/mcp/config/states/neutron_gateway
new file mode 100755
index 000000000..77b1167de
--- /dev/null
+++ b/mcp/config/states/neutron_gateway
@@ -0,0 +1,12 @@
+#!/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:gateway' state.sls neutron
diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha
index 1578dcffc..0a278760d 100755
--- a/mcp/config/states/openstack_noha
+++ b/mcp/config/states/openstack_noha
@@ -39,7 +39,6 @@ salt -I 'cinder:controller' state.sls cinder
salt -I 'cinder:volume' state.sls cinder
salt -I 'neutron:server' state.sls neutron
-salt -I 'neutron:gateway' state.sls neutron
salt -I 'nova:compute' state.sls nova