From 90a442136b0aff8380388ac0a94831d0904e3cb8 Mon Sep 17 00:00:00 2001
From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Fri, 14 Sep 2018 13:45:25 +0400
Subject: [noha] Bring in OpenDaylight SFC scenario

- bump formulas baseline during docker build;
- refresh patches;

Change-Id: I0a54863f57344c5f8897dc981f704c4d265c5522
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
---
 .../cluster/mcp-odl-noha/opendaylight/control.yml  | 31 --------------------
 .../mcp-odl-noha/opendaylight/control.yml.j2       | 34 ++++++++++++++++++++++
 2 files changed, 34 insertions(+), 31 deletions(-)
 delete mode 100644 mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml
 create mode 100644 mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2

(limited to 'mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight')

diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml
deleted file mode 100644
index 037bf0248..000000000
--- a/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml
+++ /dev/null
@@ -1,31 +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:
-  - system.linux.system.repo.mcp.openstack
-  - system.linux.system.repo.mcp.extra
-  - service.opendaylight.server.single
-  - cluster.mcp-odl-noha
-  - cluster.mcp-odl-noha.opendaylight.control_pdf
-parameters:
-  _param:
-    interface_mtu: 1500
-    linux_system_codename: xenial
-  opendaylight:
-    server:
-      odl_bind_ip: ${_param:single_address}
-      odl_rest_port: ${_param:opendaylight_rest_port}
-      java_min_mem: 3g
-      java_max_mem: 3g
-      router_enabled: true
-      karaf_features:
-        odl_default:
-          - odl-restconf-all
-          - odl-aaa-authn
-        netvirt:
-          - odl-netvirt-openstack
diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2
new file mode 100644
index 000000000..d905f7ad6
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2
@@ -0,0 +1,34 @@
+##############################################################################
+# 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:
+  - system.linux.system.repo.mcp.openstack
+  - system.linux.system.repo.mcp.extra
+  - service.opendaylight.server.single
+  - cluster.mcp-odl-noha
+  - cluster.mcp-odl-noha.opendaylight.control_pdf
+parameters:
+  _param:
+    interface_mtu: 1500
+    linux_system_codename: xenial
+  opendaylight:
+    server:
+      odl_bind_ip: ${_param:single_address}
+      odl_rest_port: ${_param:opendaylight_rest_port}
+      java_min_mem: 3g
+      java_max_mem: 3g
+      router_enabled: true
+      karaf_features:
+        odl_default:
+          - odl-restconf-all
+          - odl-aaa-authn
+        netvirt:
+          - odl-netvirt-openstack
+{%- if '-sfc-' in conf.MCP_DEPLOY_SCENARIO %}
+          - odl-netvirt-sfc
+{%- endif %}
-- 
cgit 1.2.3-korg