From 6acecf3b104a072c60d071364344b9ff04994168 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Thu, 1 Feb 2018 00:28:17 +0100 Subject: [baremetal] Rename all to drop baremetal prefix A few things differ between baremetal and virtual nodes: - provisioning method; - network setup; Since now we support completely dynamic network config based on PDF + IDF, as well as dynamic provisioning of VMs on jumpserver (as virtual cluster nodes), respectively MaaS-driven baremetal provisioning, let's drop the 'baremetal-' prefix from cluster model names and prepare for unified scenarios. Note that some limitations still apply, e.g. virtual nodes are spawned only on jumpserver (localhost) for now. JIRA: FUEL-310 Change-Id: If20077ac37c6f15961468abc58db7e16f2c29260 Signed-off-by: Alexandru Avadanii --- .../nodes/cfg01.baremetal-mcp-pike-odl-ha.local.yml | 18 ------------------ .../cfg01.baremetal-mcp-pike-ovs-dpdk-ha.local.yml | 18 ------------------ .../nodes/cfg01.baremetal-mcp-pike-ovs-ha.local.yml | 18 ------------------ mcp/reclass/nodes/cfg01.mcp-pike-odl-ha.local.yml | 18 ++++++++++++++++++ mcp/reclass/nodes/cfg01.mcp-pike-ovs-dpdk-ha.local.yml | 18 ++++++++++++++++++ mcp/reclass/nodes/cfg01.mcp-pike-ovs-ha.local.yml | 18 ++++++++++++++++++ 6 files changed, 54 insertions(+), 54 deletions(-) delete mode 100644 mcp/reclass/nodes/cfg01.baremetal-mcp-pike-odl-ha.local.yml delete mode 100644 mcp/reclass/nodes/cfg01.baremetal-mcp-pike-ovs-dpdk-ha.local.yml delete mode 100644 mcp/reclass/nodes/cfg01.baremetal-mcp-pike-ovs-ha.local.yml create mode 100644 mcp/reclass/nodes/cfg01.mcp-pike-odl-ha.local.yml create mode 100644 mcp/reclass/nodes/cfg01.mcp-pike-ovs-dpdk-ha.local.yml create mode 100644 mcp/reclass/nodes/cfg01.mcp-pike-ovs-ha.local.yml (limited to 'mcp/reclass/nodes') diff --git a/mcp/reclass/nodes/cfg01.baremetal-mcp-pike-odl-ha.local.yml b/mcp/reclass/nodes/cfg01.baremetal-mcp-pike-odl-ha.local.yml deleted file mode 100644 index fb067f038..000000000 --- a/mcp/reclass/nodes/cfg01.baremetal-mcp-pike-odl-ha.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.baremetal-mcp-pike-odl-ha.infra.config -parameters: - _param: - linux_system_codename: xenial - reclass_data_revision: master - linux: - system: - name: cfg01 - domain: baremetal-mcp-pike-odl-ha.local diff --git a/mcp/reclass/nodes/cfg01.baremetal-mcp-pike-ovs-dpdk-ha.local.yml b/mcp/reclass/nodes/cfg01.baremetal-mcp-pike-ovs-dpdk-ha.local.yml deleted file mode 100644 index df38d09b8..000000000 --- a/mcp/reclass/nodes/cfg01.baremetal-mcp-pike-ovs-dpdk-ha.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.baremetal-mcp-pike-ovs-dpdk-ha.infra.config -parameters: - _param: - linux_system_codename: xenial - reclass_data_revision: master - linux: - system: - name: cfg01 - domain: baremetal-mcp-pike-ovs-dpdk-ha.local diff --git a/mcp/reclass/nodes/cfg01.baremetal-mcp-pike-ovs-ha.local.yml b/mcp/reclass/nodes/cfg01.baremetal-mcp-pike-ovs-ha.local.yml deleted file mode 100644 index dc9c8c748..000000000 --- a/mcp/reclass/nodes/cfg01.baremetal-mcp-pike-ovs-ha.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.baremetal-mcp-pike-ovs-ha.infra.config -parameters: - _param: - linux_system_codename: xenial - reclass_data_revision: master - linux: - system: - name: cfg01 - domain: baremetal-mcp-pike-ovs-ha.local diff --git a/mcp/reclass/nodes/cfg01.mcp-pike-odl-ha.local.yml b/mcp/reclass/nodes/cfg01.mcp-pike-odl-ha.local.yml new file mode 100644 index 000000000..cbab34b45 --- /dev/null +++ b/mcp/reclass/nodes/cfg01.mcp-pike-odl-ha.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.mcp-pike-odl-ha.infra.config +parameters: + _param: + linux_system_codename: xenial + reclass_data_revision: master + linux: + system: + name: cfg01 + domain: mcp-pike-odl-ha.local diff --git a/mcp/reclass/nodes/cfg01.mcp-pike-ovs-dpdk-ha.local.yml b/mcp/reclass/nodes/cfg01.mcp-pike-ovs-dpdk-ha.local.yml new file mode 100644 index 000000000..c31233bb5 --- /dev/null +++ b/mcp/reclass/nodes/cfg01.mcp-pike-ovs-dpdk-ha.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.mcp-pike-ovs-dpdk-ha.infra.config +parameters: + _param: + linux_system_codename: xenial + reclass_data_revision: master + linux: + system: + name: cfg01 + domain: mcp-pike-ovs-dpdk-ha.local diff --git a/mcp/reclass/nodes/cfg01.mcp-pike-ovs-ha.local.yml b/mcp/reclass/nodes/cfg01.mcp-pike-ovs-ha.local.yml new file mode 100644 index 000000000..f5e3bb0be --- /dev/null +++ b/mcp/reclass/nodes/cfg01.mcp-pike-ovs-ha.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.mcp-pike-ovs-ha.infra.config +parameters: + _param: + linux_system_codename: xenial + reclass_data_revision: master + linux: + system: + name: cfg01 + domain: mcp-pike-ovs-ha.local -- cgit 1.2.3-korg