From a2429f6bdf105bfbbc92a293f86e1f5a82e6a621 Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Tue, 5 Sep 2017 20:33:32 +0200
Subject: cleanup: Rename ODL-L3 to ODL, drop ODL-L2

JIRA: FUEL-279

Change-Id: Ia8bed5e09937a1ffd29a15d40f610d4b0c8f0a17
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
 .../scenario/baremetal/os-odl-nofeature-ha.yaml    | 14 ++++++++++++++
 .../scenario/baremetal/os-odl_l3-nofeature-ha.yaml | 14 --------------
 .../scenario/virtual/os-odl-nofeature-noha.yaml    | 22 ++++++++++++++++++++++
 .../scenario/virtual/os-odl_l2-nofeature-noha.yaml | 22 ----------------------
 .../scenario/virtual/os-odl_l3-nofeature-noha.yaml | 22 ----------------------
 5 files changed, 36 insertions(+), 58 deletions(-)
 create mode 100644 mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml
 delete mode 100644 mcp/config/scenario/baremetal/os-odl_l3-nofeature-ha.yaml
 create mode 100644 mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml
 delete mode 100644 mcp/config/scenario/virtual/os-odl_l2-nofeature-noha.yaml
 delete mode 100644 mcp/config/scenario/virtual/os-odl_l3-nofeature-noha.yaml

(limited to 'mcp/config/scenario')

diff --git a/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml b/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml
new file mode 100644
index 000000000..2d5339068
--- /dev/null
+++ b/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml
@@ -0,0 +1,14 @@
+cluster:
+  domain: baremetal-mcp-ocata-odl-ha.local
+  states:
+    - maas
+    - opendaylight
+    - openstack_ha
+    - networks
+virtual:
+  nodes:
+    - cfg01
+    - mas01
+  mas01:
+    vcpus: 4
+    ram: 16384
diff --git a/mcp/config/scenario/baremetal/os-odl_l3-nofeature-ha.yaml b/mcp/config/scenario/baremetal/os-odl_l3-nofeature-ha.yaml
deleted file mode 100644
index 2d5339068..000000000
--- a/mcp/config/scenario/baremetal/os-odl_l3-nofeature-ha.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-cluster:
-  domain: baremetal-mcp-ocata-odl-ha.local
-  states:
-    - maas
-    - opendaylight
-    - openstack_ha
-    - networks
-virtual:
-  nodes:
-    - cfg01
-    - mas01
-  mas01:
-    vcpus: 4
-    ram: 16384
diff --git a/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml b/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml
new file mode 100644
index 000000000..de95e503d
--- /dev/null
+++ b/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml
@@ -0,0 +1,22 @@
+cluster:
+  domain: virtual-mcp-ocata-odl-router.local
+  states:
+    - opendaylight
+    - openstack
+    - networks
+virtual:
+  nodes:
+    - cfg01
+    - ctl01
+    - cmp01
+    - cmp02
+    - gtw01
+    - odl01
+  ctl01:
+    vcpus: 4
+    ram: 14336
+  gtw01:
+    ram: 2048
+  odl01:
+    vcpus: 4
+    ram: 5120
diff --git a/mcp/config/scenario/virtual/os-odl_l2-nofeature-noha.yaml b/mcp/config/scenario/virtual/os-odl_l2-nofeature-noha.yaml
deleted file mode 100644
index feb78c93a..000000000
--- a/mcp/config/scenario/virtual/os-odl_l2-nofeature-noha.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-cluster:
-  domain: virtual-mcp-ocata-odl.local
-  states:
-    - opendaylight
-    - openstack
-    - networks
-virtual:
-  nodes:
-    - cfg01
-    - ctl01
-    - cmp01
-    - cmp02
-    - gtw01
-    - odl01
-  ctl01:
-    vcpus: 4
-    ram: 14336
-  gtw01:
-    ram: 2048
-  odl01:
-    vcpus: 4
-    ram: 5120
diff --git a/mcp/config/scenario/virtual/os-odl_l3-nofeature-noha.yaml b/mcp/config/scenario/virtual/os-odl_l3-nofeature-noha.yaml
deleted file mode 100644
index de95e503d..000000000
--- a/mcp/config/scenario/virtual/os-odl_l3-nofeature-noha.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-cluster:
-  domain: virtual-mcp-ocata-odl-router.local
-  states:
-    - opendaylight
-    - openstack
-    - networks
-virtual:
-  nodes:
-    - cfg01
-    - ctl01
-    - cmp01
-    - cmp02
-    - gtw01
-    - odl01
-  ctl01:
-    vcpus: 4
-    ram: 14336
-  gtw01:
-    ram: 2048
-  odl01:
-    vcpus: 4
-    ram: 5120
-- 
cgit 1.2.3-korg