Bring in ovn based scenario

OVN based scenario doesn't require conventional gateway
node since connectivity to external networks and routing
occurs on compute nodes.

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

11 files changed, 113 insertions, 1 deletions

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_compute.yml
index 35c23fef7..da933dc27 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_compute.yml
@@ -10,7 +10,6 @@ classes:
   - system.linux.storage.loopback
   - service.nfs.client
   - system.nova.compute.single
-  - service.neutron.compute.single
   - service.cinder.volume.single
   - system.cinder.volume.backend.lvm
   - system.ceilometer.agent.cluster
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/compute.yml
index 6b2ca8e86..4c42b585b 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/compute.yml
@@ -7,6 +7,7 @@
 ##############################################################################
 ---
 classes:
+  - service.neutron.compute.single
   - cluster.virtual-mcp-pike-common-noha.openstack_compute
   - cluster.virtual-mcp-pike-odl-noha
 parameters:
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovn-noha/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovn-noha/infra/config.yml
new file mode 100644
index 000000000..4d0a77241
--- /dev/null
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovn-noha/infra/config.yml
@@ -0,0 +1,11 @@
+##############################################################################
+# 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
+##############################################################################
+---
+classes:
+  - cluster.virtual-mcp-pike-common-noha.infra.config
+  - cluster.virtual-mcp-pike-ovn-noha
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovn-noha/infra/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovn-noha/infra/init.yml
new file mode 100644
index 000000000..5a79adddf
--- /dev/null
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovn-noha/infra/init.yml
@@ -0,0 +1,14 @@
+##############################################################################
+# 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
+##############################################################################
+---
+classes:
+  - cluster.virtual-mcp-pike-common-noha.infra
+
+parameters:
+  _param:
+    cluster_name: virtual-mcp-pike-ovn-noha
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovn-noha/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovn-noha/init.yml
new file mode 100644
index 000000000..0fd6fa790
--- /dev/null
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovn-noha/init.yml
@@ -0,0 +1,14 @@
+##############################################################################
+# 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
+##############################################################################
+---
+classes:
+  - system.linux.system.single
+  - cluster.all-mcp-arch-common
+  - cluster.virtual-mcp-pike-common-noha.init_options
+  - cluster.virtual-mcp-pike-ovn-noha.infra
+  - cluster.virtual-mcp-pike-ovn-noha.openstack
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovn-noha/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovn-noha/openstack/compute.yml
new file mode 100644
index 000000000..a08c65217
--- /dev/null
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovn-noha/openstack/compute.yml
@@ -0,0 +1,49 @@
+##############################################################################
+# 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
+##############################################################################
+---
+classes:
+  - service.neutron.compute.ovn.single
+  - cluster.virtual-mcp-pike-common-noha.openstack_compute
+  - cluster.virtual-mcp-pike-ovn-noha
+parameters:
+  linux:
+    network:
+      interface:
+        external_interface:
+          enabled: true
+          name: ${_param:external_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
+        br-mesh:
+          enabled: true
+          type: bridge
+          proto: static
+          address: ${_param:tenant_address}
+          netmask: 255.255.255.0
+          use_interfaces:
+            - ${_param:tenant_interface}
+        br-floating:
+          enabled: true
+          type: ovs_bridge
+          mtu: ${_param:interface_mtu}
+        float-to-ex:
+          enabled: true
+          type: ovs_port
+          mtu: ${_param:interface_mtu}
+          bridge: br-floating
+        br-ex:
+          enabled: true
+          type: bridge
+          mtu: ${_param:interface_mtu}
+          address: ${_param:external_address}
+          netmask: 255.255.255.0
+          use_interfaces:
+            - ${_param:external_interface}
+          use_ovs_ports:
+            - float-to-ex
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovn-noha/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovn-noha/openstack/control.yml
new file mode 100644
index 000000000..59c000746
--- /dev/null
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovn-noha/openstack/control.yml
@@ -0,0 +1,12 @@
+##############################################################################
+# 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
+##############################################################################
+---
+classes:
+  - system.neutron.control.ovn.single
+  - cluster.virtual-mcp-pike-common-noha.openstack_control
+  - cluster.virtual-mcp-pike-ovn-noha
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovn-noha/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovn-noha/openstack/init.yml
new file mode 100644
index 000000000..8ae660706
--- /dev/null
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovn-noha/openstack/init.yml
@@ -0,0 +1,10 @@
+##############################################################################
+# 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
+##############################################################################
+---
+classes:
+  - cluster.virtual-mcp-pike-common-noha.openstack_init
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/compute.yml
index 0f53477eb..819fa5efa 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/compute.yml
@@ -9,6 +9,7 @@
 classes:
   - system.nova.compute.nfv.hugepages
   - system.neutron.compute.nfv.dpdk
+  - service.neutron.compute.single
   - cluster.virtual-mcp-pike-common-noha.openstack_compute
   - cluster.virtual-mcp-pike-ovs-dpdk-noha
 parameters:
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/compute.yml
index 11e0d522e..52edf879f 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/compute.yml
@@ -7,6 +7,7 @@
 ##############################################################################
 ---
 classes:
+  - service.neutron.compute.single
   - cluster.virtual-mcp-pike-common-noha.openstack_compute
   - cluster.virtual-mcp-pike-ovs-noha
 parameters:
diff --git a/mcp/reclass/classes/system b/mcp/reclass/classes/system
-Subproject f3ef0fc2b794c7cf648f4be884954b827efe16f
+Subproject 426fec4fa187be968eaf57374c956a361aa6541