From 09dce2a2643223d66aa1ac3a0ad8feebc082f521 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 28 Nov 2017 20:27:05 +0100 Subject: Rename reclass models to add "-ha" or "-noha" Parse all reclass j2 templates, not only common + current scenario (useful when adding new scenarios later). JIRA: FUEL-310 Change-Id: I8e87af702f83c42cb8f766bf6f121449aa5f2c26 Signed-off-by: Alexandru Avadanii --- .../nodes/cfg01.virtual-mcp-pike-odl-noha.local.yml | 18 ++++++++++++++++++ mcp/reclass/nodes/cfg01.virtual-mcp-pike-odl.local.yml | 18 ------------------ .../cfg01.virtual-mcp-pike-ovs-dpdk-noha.local.yml | 18 ++++++++++++++++++ .../nodes/cfg01.virtual-mcp-pike-ovs-dpdk.local.yml | 18 ------------------ .../nodes/cfg01.virtual-mcp-pike-ovs-noha.local.yml | 18 ++++++++++++++++++ mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs.local.yml | 18 ------------------ 6 files changed, 54 insertions(+), 54 deletions(-) create mode 100644 mcp/reclass/nodes/cfg01.virtual-mcp-pike-odl-noha.local.yml delete mode 100644 mcp/reclass/nodes/cfg01.virtual-mcp-pike-odl.local.yml create mode 100644 mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs-dpdk-noha.local.yml delete mode 100644 mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs-dpdk.local.yml create mode 100644 mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs-noha.local.yml delete mode 100644 mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs.local.yml (limited to 'mcp/reclass/nodes') diff --git a/mcp/reclass/nodes/cfg01.virtual-mcp-pike-odl-noha.local.yml b/mcp/reclass/nodes/cfg01.virtual-mcp-pike-odl-noha.local.yml new file mode 100644 index 000000000..8828a9312 --- /dev/null +++ b/mcp/reclass/nodes/cfg01.virtual-mcp-pike-odl-noha.local.yml @@ -0,0 +1,18 @@ +############################################################################## +# 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 +############################################################################## +--- +classes: + - cluster.virtual-mcp-pike-odl-noha.infra.config +parameters: + _param: + linux_system_codename: xenial + reclass_data_revision: master + linux: + system: + name: cfg01 + domain: virtual-mcp-pike-odl-noha.local diff --git a/mcp/reclass/nodes/cfg01.virtual-mcp-pike-odl.local.yml b/mcp/reclass/nodes/cfg01.virtual-mcp-pike-odl.local.yml deleted file mode 100644 index 4b8e883cf..000000000 --- a/mcp/reclass/nodes/cfg01.virtual-mcp-pike-odl.local.yml +++ /dev/null @@ -1,18 +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 -############################################################################## ---- -classes: - - cluster.virtual-mcp-pike-odl.infra.config -parameters: - _param: - linux_system_codename: xenial - reclass_data_revision: master - linux: - system: - name: cfg01 - domain: virtual-mcp-pike-odl.local diff --git a/mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs-dpdk-noha.local.yml b/mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs-dpdk-noha.local.yml new file mode 100644 index 000000000..4c435f873 --- /dev/null +++ b/mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs-dpdk-noha.local.yml @@ -0,0 +1,18 @@ +############################################################################## +# 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 +############################################################################## +--- +classes: + - cluster.virtual-mcp-pike-ovs-dpdk-noha.infra.config +parameters: + _param: + linux_system_codename: xenial + reclass_data_revision: master + linux: + system: + name: cfg01 + domain: virtual-mcp-pike-ovs-dpdk-noha.local diff --git a/mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs-dpdk.local.yml b/mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs-dpdk.local.yml deleted file mode 100644 index bf68ab88d..000000000 --- a/mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs-dpdk.local.yml +++ /dev/null @@ -1,18 +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 -############################################################################## ---- -classes: - - cluster.virtual-mcp-pike-ovs-dpdk.infra.config -parameters: - _param: - linux_system_codename: xenial - reclass_data_revision: master - linux: - system: - name: cfg01 - domain: virtual-mcp-pike-ovs-dpdk.local diff --git a/mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs-noha.local.yml b/mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs-noha.local.yml new file mode 100644 index 000000000..7a715cfb8 --- /dev/null +++ b/mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs-noha.local.yml @@ -0,0 +1,18 @@ +############################################################################## +# 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 +############################################################################## +--- +classes: + - cluster.virtual-mcp-pike-ovs-noha.infra.config +parameters: + _param: + linux_system_codename: xenial + reclass_data_revision: master + linux: + system: + name: cfg01 + domain: virtual-mcp-pike-ovs-noha.local diff --git a/mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs.local.yml b/mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs.local.yml deleted file mode 100644 index 514946b1c..000000000 --- a/mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs.local.yml +++ /dev/null @@ -1,18 +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 -############################################################################## ---- -classes: - - cluster.virtual-mcp-pike-ovs.infra.config -parameters: - _param: - linux_system_codename: xenial - reclass_data_revision: master - linux: - system: - name: cfg01 - domain: virtual-mcp-pike-ovs.local -- cgit 1.2.3-korg