From 2a1201f80fe5800ffbdf71917eddfeb3a5f6c4c1 Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Sat, 4 Aug 2018 07:29:15 +0200
Subject: [noha] Parameterize network configuration

- odl01: Use a bridge for br-ctl to allow tagged mgmt;
- ctl01: Use bridges for br-ctl, br-ext;
- ctl01: Use mtu 1500 since jumbo frames seems to break nova cell
  discovery;

JIRA: FUEL-382

Change-Id: I9bf48711930cac77a089e4d7b7ba98924dd161ee
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
 .../mcp-ovs-dpdk-noha/openstack/compute.yml.j2     |  2 +-
 .../mcp-ovs-dpdk-noha/openstack/gateway.yml        | 26 ---------------------
 .../mcp-ovs-dpdk-noha/openstack/gateway.yml.j2     | 27 ++++++++++++++++++++++
 3 files changed, 28 insertions(+), 27 deletions(-)
 delete mode 100644 mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/gateway.yml
 create mode 100644 mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/gateway.yml.j2

(limited to 'mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack')

diff --git a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/compute.yml.j2 b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/compute.yml.j2
index 3e4eeceab..df2911104 100644
--- a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/compute.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/compute.yml.j2
@@ -37,5 +37,5 @@ parameters:
         br-prv:
           enabled: true
           type: dpdk_ovs_bridge
-        tenant_interface:
+        {{ nm.cmp001.nic_private }}:
           type: dpdk  # Not a meaningful type, just match 'dpdk' for filtering
diff --git a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/gateway.yml b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/gateway.yml
deleted file mode 100644
index 2f9aee6fd..000000000
--- a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/gateway.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-##############################################################################
-# Copyright (c) 2018 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.mcp-common-noha.openstack_gateway
-  - service.neutron.gateway.single
-  - cluster.mcp-ovs-dpdk-noha
-parameters:
-  neutron:
-    gateway:
-      backend:
-        tenant_network_types: ${_param:neutron_tenant_network_types}
-  linux:
-    network:
-      interface:
-        tenant_interface:
-          ovs_bridge: br-prv
-        br-prv:
-          enabled: true
-          type: ovs_bridge
-          mtu: ${_param:interface_mtu}
diff --git a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/gateway.yml.j2 b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/gateway.yml.j2
new file mode 100644
index 000000000..2f89ac3f8
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/gateway.yml.j2
@@ -0,0 +1,27 @@
+##############################################################################
+# Copyright (c) 2018 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
+##############################################################################
+{%- import 'net_map.j2' as nm with context %}
+---
+classes:
+  - cluster.mcp-common-noha.openstack_gateway
+  - service.neutron.gateway.single
+  - cluster.mcp-ovs-dpdk-noha
+parameters:
+  neutron:
+    gateway:
+      backend:
+        tenant_network_types: ${_param:neutron_tenant_network_types}
+  linux:
+    network:
+      interface:
+        {{ nm.cmp001.nic_private }}:
+          ovs_bridge: br-prv
+        br-prv:
+          enabled: true
+          type: ovs_bridge
+          mtu: ${_param:interface_mtu}
-- 
cgit 1.2.3-korg