From 91cbeba3e6fce6a9d292a7af8849db293617038b Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sat, 4 Aug 2018 18:10:13 +0200 Subject: [PATCH] [scenarios] noha: Add MaaS VM, state to scenarios JIRA: FUEL-382 Change-Id: Ib1f905bec87ce2afe643b4aa3b0201d7100be16d Signed-off-by: Alexandru Avadanii --- mcp/config/scenario/.gitignore | 2 +- ...-nosdn-nofeature-noha.yaml => os-nosdn-nofeature-noha.yaml.j2} | 8 ++++++++ .../{os-nosdn-ovs-noha.yaml => os-nosdn-ovs-noha.yaml.j2} | 8 ++++++++ .../{os-odl-nofeature-noha.yaml => os-odl-nofeature-noha.yaml.j2} | 8 ++++++++ .../scenario/{os-odl-ovs-noha.yaml => os-odl-ovs-noha.yaml.j2} | 8 ++++++++ .../{os-ovn-nofeature-noha.yaml => os-ovn-nofeature-noha.yaml.j2} | 8 ++++++++ 6 files changed, 41 insertions(+), 1 deletion(-) rename mcp/config/scenario/{os-nosdn-nofeature-noha.yaml => os-nosdn-nofeature-noha.yaml.j2} (79%) rename mcp/config/scenario/{os-nosdn-ovs-noha.yaml => os-nosdn-ovs-noha.yaml.j2} (80%) rename mcp/config/scenario/{os-odl-nofeature-noha.yaml => os-odl-nofeature-noha.yaml.j2} (80%) rename mcp/config/scenario/{os-odl-ovs-noha.yaml => os-odl-ovs-noha.yaml.j2} (81%) rename mcp/config/scenario/{os-ovn-nofeature-noha.yaml => os-ovn-nofeature-noha.yaml.j2} (79%) 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.j2 similarity index 79% rename from mcp/config/scenario/os-nosdn-nofeature-noha.yaml rename to mcp/config/scenario/os-nosdn-nofeature-noha.yaml.j2 index 8a3a33db0..a0ad96b87 100644 --- a/mcp/config/scenario/os-nosdn-nofeature-noha.yaml +++ b/mcp/config/scenario/os-nosdn-nofeature-noha.yaml.j2 @@ -5,10 +5,15 @@ # 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 @@ -16,6 +21,9 @@ virtual: nodes: infra: - cfg01 +{%- if nm.cluster.has_baremetal_nodes %} + - mas01 +{%- endif %} control: - ctl01 - gtw01 diff --git a/mcp/config/scenario/os-nosdn-ovs-noha.yaml b/mcp/config/scenario/os-nosdn-ovs-noha.yaml.j2 similarity index 80% rename from mcp/config/scenario/os-nosdn-ovs-noha.yaml rename to mcp/config/scenario/os-nosdn-ovs-noha.yaml.j2 index 795b73064..bee0e926f 100644 --- a/mcp/config/scenario/os-nosdn-ovs-noha.yaml +++ b/mcp/config/scenario/os-nosdn-ovs-noha.yaml.j2 @@ -5,10 +5,15 @@ # 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 @@ -17,6 +22,9 @@ virtual: nodes: infra: - cfg01 +{%- if nm.cluster.has_baremetal_nodes %} + - mas01 +{%- endif %} control: - ctl01 - gtw01 diff --git a/mcp/config/scenario/os-odl-nofeature-noha.yaml b/mcp/config/scenario/os-odl-nofeature-noha.yaml.j2 similarity index 80% rename from mcp/config/scenario/os-odl-nofeature-noha.yaml rename to mcp/config/scenario/os-odl-nofeature-noha.yaml.j2 index d0a490ef9..7df28c2b3 100644 --- a/mcp/config/scenario/os-odl-nofeature-noha.yaml +++ b/mcp/config/scenario/os-odl-nofeature-noha.yaml.j2 @@ -5,10 +5,15 @@ # 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 @@ -17,6 +22,9 @@ virtual: nodes: infra: - cfg01 +{%- if nm.cluster.has_baremetal_nodes %} + - mas01 +{%- endif %} control: - ctl01 - gtw01 diff --git a/mcp/config/scenario/os-odl-ovs-noha.yaml b/mcp/config/scenario/os-odl-ovs-noha.yaml.j2 similarity index 81% rename from mcp/config/scenario/os-odl-ovs-noha.yaml rename to mcp/config/scenario/os-odl-ovs-noha.yaml.j2 index 29e6842ac..c81d35c51 100644 --- a/mcp/config/scenario/os-odl-ovs-noha.yaml +++ b/mcp/config/scenario/os-odl-ovs-noha.yaml.j2 @@ -5,10 +5,15 @@ # 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 @@ -18,6 +23,9 @@ virtual: nodes: infra: - cfg01 +{%- if nm.cluster.has_baremetal_nodes %} + - mas01 +{%- endif %} control: - ctl01 - gtw01 diff --git a/mcp/config/scenario/os-ovn-nofeature-noha.yaml b/mcp/config/scenario/os-ovn-nofeature-noha.yaml.j2 similarity index 79% rename from mcp/config/scenario/os-ovn-nofeature-noha.yaml rename to mcp/config/scenario/os-ovn-nofeature-noha.yaml.j2 index fc4086670..fee47d7eb 100644 --- a/mcp/config/scenario/os-ovn-nofeature-noha.yaml +++ b/mcp/config/scenario/os-ovn-nofeature-noha.yaml.j2 @@ -5,16 +5,24 @@ # 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: -- 2.16.6