From 91cbeba3e6fce6a9d292a7af8849db293617038b Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Sat, 4 Aug 2018 18:10:13 +0200
Subject: [scenarios] noha: Add MaaS VM, state to scenarios
JIRA: FUEL-382
Change-Id: Ib1f905bec87ce2afe643b4aa3b0201d7100be16d
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
mcp/config/scenario/.gitignore | 2 +-
mcp/config/scenario/os-nosdn-nofeature-noha.yaml | 29 -------------
.../scenario/os-nosdn-nofeature-noha.yaml.j2 | 37 ++++++++++++++++
mcp/config/scenario/os-nosdn-ovs-noha.yaml | 36 ----------------
mcp/config/scenario/os-nosdn-ovs-noha.yaml.j2 | 44 +++++++++++++++++++
mcp/config/scenario/os-odl-nofeature-noha.yaml | 34 ---------------
mcp/config/scenario/os-odl-nofeature-noha.yaml.j2 | 42 +++++++++++++++++++
mcp/config/scenario/os-odl-ovs-noha.yaml | 41 ------------------
mcp/config/scenario/os-odl-ovs-noha.yaml.j2 | 49 ++++++++++++++++++++++
mcp/config/scenario/os-ovn-nofeature-noha.yaml | 31 --------------
mcp/config/scenario/os-ovn-nofeature-noha.yaml.j2 | 39 +++++++++++++++++
11 files changed, 212 insertions(+), 172 deletions(-)
delete mode 100644 mcp/config/scenario/os-nosdn-nofeature-noha.yaml
create mode 100644 mcp/config/scenario/os-nosdn-nofeature-noha.yaml.j2
delete mode 100644 mcp/config/scenario/os-nosdn-ovs-noha.yaml
create mode 100644 mcp/config/scenario/os-nosdn-ovs-noha.yaml.j2
delete mode 100644 mcp/config/scenario/os-odl-nofeature-noha.yaml
create mode 100644 mcp/config/scenario/os-odl-nofeature-noha.yaml.j2
delete mode 100644 mcp/config/scenario/os-odl-ovs-noha.yaml
create mode 100644 mcp/config/scenario/os-odl-ovs-noha.yaml.j2
delete mode 100644 mcp/config/scenario/os-ovn-nofeature-noha.yaml
create mode 100644 mcp/config/scenario/os-ovn-nofeature-noha.yaml.j2
(limited to 'mcp')
diff --git a/mcp/config/scenario/.gitignore b/mcp/config/scenario/.gitignore
index 46c7f92c8..a2d43db14 100644
--- a/mcp/config/scenario/.gitignore
+++ b/mcp/config/scenario/.gitignore
@@ -1 +1 @@
-*-ha.yaml
+*ha.yaml
diff --git a/mcp/config/scenario/os-nosdn-nofeature-noha.yaml b/mcp/config/scenario/os-nosdn-nofeature-noha.yaml
deleted file mode 100644
index 8a3a33db0..000000000
--- a/mcp/config/scenario/os-nosdn-nofeature-noha.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-##############################################################################
-# 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: mcp-ovs-noha.local
- states:
- - openstack_noha
- - neutron_gateway
- - networks
-virtual:
- nodes:
- infra:
- - cfg01
- control:
- - ctl01
- - gtw01
- compute:
- - cmp001
- - cmp002
- ctl01:
- vcpus: 4
- ram: 14336
- gtw01:
- ram: 2048
diff --git a/mcp/config/scenario/os-nosdn-nofeature-noha.yaml.j2 b/mcp/config/scenario/os-nosdn-nofeature-noha.yaml.j2
new file mode 100644
index 000000000..a0ad96b87
--- /dev/null
+++ b/mcp/config/scenario/os-nosdn-nofeature-noha.yaml.j2
@@ -0,0 +1,37 @@
+##############################################################################
+# 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
+##############################################################################
+{%- import 'net_map.j2' as nm with context %}
+---
+cluster:
+ domain: mcp-ovs-noha.local
+ states:
+{%- if nm.cluster.has_baremetal_nodes %}
+ - maas
+ - baremetal_init
+{%- endif %}
+ - openstack_noha
+ - neutron_gateway
+ - networks
+virtual:
+ nodes:
+ infra:
+ - cfg01
+{%- if nm.cluster.has_baremetal_nodes %}
+ - mas01
+{%- endif %}
+ control:
+ - ctl01
+ - gtw01
+ compute:
+ - cmp001
+ - cmp002
+ ctl01:
+ vcpus: 4
+ ram: 14336
+ gtw01:
+ ram: 2048
diff --git a/mcp/config/scenario/os-nosdn-ovs-noha.yaml b/mcp/config/scenario/os-nosdn-ovs-noha.yaml
deleted file mode 100644
index 795b73064..000000000
--- a/mcp/config/scenario/os-nosdn-ovs-noha.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-##############################################################################
-# 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: mcp-ovs-dpdk-noha.local
- states:
- - dpdk
- - openstack_noha
- - neutron_gateway
- - networks
-virtual:
- nodes:
- infra:
- - cfg01
- control:
- - ctl01
- - gtw01
- compute:
- - cmp001
- - cmp002
- ctl01:
- vcpus: 4
- ram: 14336
- gtw01:
- ram: 2048
- cmp001:
- vcpus: 4
- ram: 8192
- cmp002:
- vcpus: 4
- ram: 8192
diff --git a/mcp/config/scenario/os-nosdn-ovs-noha.yaml.j2 b/mcp/config/scenario/os-nosdn-ovs-noha.yaml.j2
new file mode 100644
index 000000000..bee0e926f
--- /dev/null
+++ b/mcp/config/scenario/os-nosdn-ovs-noha.yaml.j2
@@ -0,0 +1,44 @@
+##############################################################################
+# 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
+##############################################################################
+{%- import 'net_map.j2' as nm with context %}
+---
+cluster:
+ domain: mcp-ovs-dpdk-noha.local
+ states:
+{%- if nm.cluster.has_baremetal_nodes %}
+ - maas
+ - baremetal_init
+{%- endif %}
+ - dpdk
+ - openstack_noha
+ - neutron_gateway
+ - networks
+virtual:
+ nodes:
+ infra:
+ - cfg01
+{%- if nm.cluster.has_baremetal_nodes %}
+ - mas01
+{%- endif %}
+ control:
+ - ctl01
+ - gtw01
+ compute:
+ - cmp001
+ - cmp002
+ ctl01:
+ vcpus: 4
+ ram: 14336
+ gtw01:
+ ram: 2048
+ cmp001:
+ vcpus: 4
+ ram: 8192
+ cmp002:
+ vcpus: 4
+ ram: 8192
diff --git a/mcp/config/scenario/os-odl-nofeature-noha.yaml b/mcp/config/scenario/os-odl-nofeature-noha.yaml
deleted file mode 100644
index d0a490ef9..000000000
--- a/mcp/config/scenario/os-odl-nofeature-noha.yaml
+++ /dev/null
@@ -1,34 +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
-##############################################################################
----
-cluster:
- domain: mcp-odl-noha.local
- states:
- - opendaylight
- - openstack_noha
- - neutron_gateway
- - networks
-virtual:
- nodes:
- infra:
- - cfg01
- control:
- - ctl01
- - gtw01
- - odl01
- compute:
- - cmp001
- - cmp002
- ctl01:
- vcpus: 4
- ram: 14336
- gtw01:
- ram: 2048
- odl01:
- vcpus: 4
- ram: 5120
diff --git a/mcp/config/scenario/os-odl-nofeature-noha.yaml.j2 b/mcp/config/scenario/os-odl-nofeature-noha.yaml.j2
new file mode 100644
index 000000000..7df28c2b3
--- /dev/null
+++ b/mcp/config/scenario/os-odl-nofeature-noha.yaml.j2
@@ -0,0 +1,42 @@
+##############################################################################
+# 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 %}
+---
+cluster:
+ domain: mcp-odl-noha.local
+ states:
+{%- if nm.cluster.has_baremetal_nodes %}
+ - maas
+ - baremetal_init
+{%- endif %}
+ - opendaylight
+ - openstack_noha
+ - neutron_gateway
+ - networks
+virtual:
+ nodes:
+ infra:
+ - cfg01
+{%- if nm.cluster.has_baremetal_nodes %}
+ - mas01
+{%- endif %}
+ control:
+ - ctl01
+ - gtw01
+ - odl01
+ compute:
+ - cmp001
+ - cmp002
+ ctl01:
+ vcpus: 4
+ ram: 14336
+ gtw01:
+ ram: 2048
+ odl01:
+ vcpus: 4
+ ram: 5120
diff --git a/mcp/config/scenario/os-odl-ovs-noha.yaml b/mcp/config/scenario/os-odl-ovs-noha.yaml
deleted file mode 100644
index 29e6842ac..000000000
--- a/mcp/config/scenario/os-odl-ovs-noha.yaml
+++ /dev/null
@@ -1,41 +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
-##############################################################################
----
-cluster:
- domain: mcp-odl-noha.local
- states:
- - dpdk
- - opendaylight
- - openstack_noha
- - neutron_gateway
- - networks
-virtual:
- nodes:
- infra:
- - cfg01
- control:
- - ctl01
- - gtw01
- - odl01
- compute:
- - cmp001
- - cmp002
- ctl01:
- vcpus: 4
- ram: 14336
- gtw01:
- ram: 1024
- odl01:
- vcpus: 4
- ram: 5120
- cmp001:
- vcpus: 4
- ram: 8192
- cmp002:
- vcpus: 4
- ram: 8192
diff --git a/mcp/config/scenario/os-odl-ovs-noha.yaml.j2 b/mcp/config/scenario/os-odl-ovs-noha.yaml.j2
new file mode 100644
index 000000000..c81d35c51
--- /dev/null
+++ b/mcp/config/scenario/os-odl-ovs-noha.yaml.j2
@@ -0,0 +1,49 @@
+##############################################################################
+# 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 %}
+---
+cluster:
+ domain: mcp-odl-noha.local
+ states:
+{%- if nm.cluster.has_baremetal_nodes %}
+ - maas
+ - baremetal_init
+{%- endif %}
+ - dpdk
+ - opendaylight
+ - openstack_noha
+ - neutron_gateway
+ - networks
+virtual:
+ nodes:
+ infra:
+ - cfg01
+{%- if nm.cluster.has_baremetal_nodes %}
+ - mas01
+{%- endif %}
+ control:
+ - ctl01
+ - gtw01
+ - odl01
+ compute:
+ - cmp001
+ - cmp002
+ ctl01:
+ vcpus: 4
+ ram: 14336
+ gtw01:
+ ram: 1024
+ odl01:
+ vcpus: 4
+ ram: 5120
+ cmp001:
+ vcpus: 4
+ ram: 8192
+ cmp002:
+ vcpus: 4
+ ram: 8192
diff --git a/mcp/config/scenario/os-ovn-nofeature-noha.yaml b/mcp/config/scenario/os-ovn-nofeature-noha.yaml
deleted file mode 100644
index fc4086670..000000000
--- a/mcp/config/scenario/os-ovn-nofeature-noha.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-##############################################################################
-# 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: mcp-ovn-noha.local
- states:
- - openstack_noha
- - networks
-virtual:
- nodes:
- infra:
- - cfg01
- control:
- - ctl01
- compute:
- - cmp001
- - cmp002
- ctl01:
- vcpus: 4
- ram: 14336
- cmp001:
- vcpus: 5
- ram: 8192
- cmp002:
- vcpus: 5
- ram: 8192
diff --git a/mcp/config/scenario/os-ovn-nofeature-noha.yaml.j2 b/mcp/config/scenario/os-ovn-nofeature-noha.yaml.j2
new file mode 100644
index 000000000..fee47d7eb
--- /dev/null
+++ b/mcp/config/scenario/os-ovn-nofeature-noha.yaml.j2
@@ -0,0 +1,39 @@
+##############################################################################
+# 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
+##############################################################################
+{%- import 'net_map.j2' as nm with context %}
+---
+cluster:
+ domain: mcp-ovn-noha.local
+ states:
+{%- if nm.cluster.has_baremetal_nodes %}
+ - maas
+ - baremetal_init
+{%- endif %}
+ - openstack_noha
+ - networks
+virtual:
+ nodes:
+ infra:
+ - cfg01
+{%- if nm.cluster.has_baremetal_nodes %}
+ - mas01
+{%- endif %}
+ control:
+ - ctl01
+ compute:
+ - cmp001
+ - cmp002
+ ctl01:
+ vcpus: 4
+ ram: 14336
+ cmp001:
+ vcpus: 5
+ ram: 8192
+ cmp002:
+ vcpus: 5
+ ram: 8192
--
cgit