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 --- .../cluster/mcp-pike-ovs-dpdk-noha/infra/config.yml | 21 --------------------- .../cluster/mcp-pike-ovs-dpdk-noha/infra/init.yml | 14 -------------- 2 files changed, 35 deletions(-) delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/infra/config.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/infra/init.yml (limited to 'mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/infra') diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/infra/config.yml deleted file mode 100644 index baf072fd8..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/infra/config.yml +++ /dev/null @@ -1,21 +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 -############################################################################## ---- -classes: - - system.reclass.storage.system.openstack_gateway_single - - cluster.mcp-pike-common-noha.infra.config - - cluster.mcp-pike-ovs-dpdk-noha - - cluster.all-mcp-arch-common.infra.config_dpdk_pdf -parameters: - reclass: - storage: - node: - openstack_gateway_node01: - params: - tenant_address: ${_param:opnfv_openstack_gateway_node01_tenant_address} - external_address: ${_param:opnfv_openstack_gateway_node01_external_address} diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/infra/init.yml deleted file mode 100644 index d8cb01596..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/infra/init.yml +++ /dev/null @@ -1,14 +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 -############################################################################## ---- -classes: - - cluster.mcp-pike-common-noha.infra - -parameters: - _param: - cluster_name: mcp-pike-ovs-dpdk-noha -- cgit