From afae8d4d99d962448eb62cdd306f7a3dcda83744 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Mon, 4 Jun 2018 17:55:52 +0400 Subject: [noha] Update OpenStack version to Queens * make cluster names version-agnostic * pre-install oslo-templates formula * salt version update to 2017.7 * system reclass update Change-Id: I903895f6bcd98a1062e66e3f14d23ec04dc1b869 Signed-off-by: Michael Polenchuk --- mcp/reclass/nodes/cfg01.mcp-odl-noha.local.yml | 18 ++++++++++++++++++ mcp/reclass/nodes/cfg01.mcp-ovn-noha.local.yml | 18 ++++++++++++++++++ mcp/reclass/nodes/cfg01.mcp-ovs-dpdk-noha.local.yml | 18 ++++++++++++++++++ mcp/reclass/nodes/cfg01.mcp-ovs-noha.local.yml | 18 ++++++++++++++++++ mcp/reclass/nodes/cfg01.mcp-pike-odl-noha.local.yml | 18 ------------------ mcp/reclass/nodes/cfg01.mcp-pike-ovn-noha.local.yml | 18 ------------------ .../nodes/cfg01.mcp-pike-ovs-dpdk-noha.local.yml | 18 ------------------ mcp/reclass/nodes/cfg01.mcp-pike-ovs-noha.local.yml | 18 ------------------ 8 files changed, 72 insertions(+), 72 deletions(-) create mode 100644 mcp/reclass/nodes/cfg01.mcp-odl-noha.local.yml create mode 100644 mcp/reclass/nodes/cfg01.mcp-ovn-noha.local.yml create mode 100644 mcp/reclass/nodes/cfg01.mcp-ovs-dpdk-noha.local.yml create mode 100644 mcp/reclass/nodes/cfg01.mcp-ovs-noha.local.yml delete mode 100644 mcp/reclass/nodes/cfg01.mcp-pike-odl-noha.local.yml delete mode 100644 mcp/reclass/nodes/cfg01.mcp-pike-ovn-noha.local.yml delete mode 100644 mcp/reclass/nodes/cfg01.mcp-pike-ovs-dpdk-noha.local.yml delete mode 100644 mcp/reclass/nodes/cfg01.mcp-pike-ovs-noha.local.yml (limited to 'mcp/reclass/nodes') diff --git a/mcp/reclass/nodes/cfg01.mcp-odl-noha.local.yml b/mcp/reclass/nodes/cfg01.mcp-odl-noha.local.yml new file mode 100644 index 000000000..4fd327242 --- /dev/null +++ b/mcp/reclass/nodes/cfg01.mcp-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.mcp-odl-noha.infra.config +parameters: + _param: + linux_system_codename: xenial + reclass_data_revision: master + linux: + system: + name: cfg01 + domain: mcp-odl-noha.local diff --git a/mcp/reclass/nodes/cfg01.mcp-ovn-noha.local.yml b/mcp/reclass/nodes/cfg01.mcp-ovn-noha.local.yml new file mode 100644 index 000000000..6ae0367b9 --- /dev/null +++ b/mcp/reclass/nodes/cfg01.mcp-ovn-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.mcp-ovn-noha.infra.config +parameters: + _param: + linux_system_codename: xenial + reclass_data_revision: master + linux: + system: + name: cfg01 + domain: mcp-ovn-noha.local diff --git a/mcp/reclass/nodes/cfg01.mcp-ovs-dpdk-noha.local.yml b/mcp/reclass/nodes/cfg01.mcp-ovs-dpdk-noha.local.yml new file mode 100644 index 000000000..30b61848e --- /dev/null +++ b/mcp/reclass/nodes/cfg01.mcp-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.mcp-ovs-dpdk-noha.infra.config +parameters: + _param: + linux_system_codename: xenial + reclass_data_revision: master + linux: + system: + name: cfg01 + domain: mcp-ovs-dpdk-noha.local diff --git a/mcp/reclass/nodes/cfg01.mcp-ovs-noha.local.yml b/mcp/reclass/nodes/cfg01.mcp-ovs-noha.local.yml new file mode 100644 index 000000000..658061b26 --- /dev/null +++ b/mcp/reclass/nodes/cfg01.mcp-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.mcp-ovs-noha.infra.config +parameters: + _param: + linux_system_codename: xenial + reclass_data_revision: master + linux: + system: + name: cfg01 + domain: mcp-ovs-noha.local diff --git a/mcp/reclass/nodes/cfg01.mcp-pike-odl-noha.local.yml b/mcp/reclass/nodes/cfg01.mcp-pike-odl-noha.local.yml deleted file mode 100644 index a4a21ba6a..000000000 --- a/mcp/reclass/nodes/cfg01.mcp-pike-odl-noha.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.mcp-pike-odl-noha.infra.config -parameters: - _param: - linux_system_codename: xenial - reclass_data_revision: master - linux: - system: - name: cfg01 - domain: mcp-pike-odl-noha.local diff --git a/mcp/reclass/nodes/cfg01.mcp-pike-ovn-noha.local.yml b/mcp/reclass/nodes/cfg01.mcp-pike-ovn-noha.local.yml deleted file mode 100644 index 0df357a26..000000000 --- a/mcp/reclass/nodes/cfg01.mcp-pike-ovn-noha.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.mcp-pike-ovn-noha.infra.config -parameters: - _param: - linux_system_codename: xenial - reclass_data_revision: master - linux: - system: - name: cfg01 - domain: mcp-pike-ovn-noha.local diff --git a/mcp/reclass/nodes/cfg01.mcp-pike-ovs-dpdk-noha.local.yml b/mcp/reclass/nodes/cfg01.mcp-pike-ovs-dpdk-noha.local.yml deleted file mode 100644 index 394a9f6b6..000000000 --- a/mcp/reclass/nodes/cfg01.mcp-pike-ovs-dpdk-noha.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.mcp-pike-ovs-dpdk-noha.infra.config -parameters: - _param: - linux_system_codename: xenial - reclass_data_revision: master - linux: - system: - name: cfg01 - domain: mcp-pike-ovs-dpdk-noha.local diff --git a/mcp/reclass/nodes/cfg01.mcp-pike-ovs-noha.local.yml b/mcp/reclass/nodes/cfg01.mcp-pike-ovs-noha.local.yml deleted file mode 100644 index 793e7c0d4..000000000 --- a/mcp/reclass/nodes/cfg01.mcp-pike-ovs-noha.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.mcp-pike-ovs-noha.infra.config -parameters: - _param: - linux_system_codename: xenial - reclass_data_revision: master - linux: - system: - name: cfg01 - domain: mcp-pike-ovs-noha.local -- cgit 1.2.3-korg