From bf341b7e0d7e423044827f379e4b180e9dc897a1 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Thu, 7 Jun 2018 17:19:27 +0400 Subject: [ha] Update OpenStack version to Queens * make cluster names version-agnostic * switch to mirror.mirantis.com * system reclass update Change-Id: I96394b3c9d8d38321289af8e3a4e8bbc5dd7a408 Signed-off-by: Michael Polenchuk --- .../cluster/mcp-pike-ovs-dpdk-ha/infra/config.yml | 12 ------------ .../cluster/mcp-pike-ovs-dpdk-ha/infra/init.yml | 19 ------------------- .../mcp-pike-ovs-dpdk-ha/infra/init_vcp.yml.j2 | 12 ------------ .../cluster/mcp-pike-ovs-dpdk-ha/infra/kvm.yml.j2 | 14 -------------- .../cluster/mcp-pike-ovs-dpdk-ha/infra/maas.yml | 11 ----------- 5 files changed, 68 deletions(-) delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/config.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/init.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/init_vcp.yml.j2 delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/kvm.yml.j2 delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/maas.yml (limited to 'mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra') diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/config.yml deleted file mode 100644 index 0b0632609..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/config.yml +++ /dev/null @@ -1,12 +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-ha.infra.config - - cluster.mcp-pike-ovs-dpdk-ha.infra - - cluster.all-mcp-arch-common.infra.config_dpdk_pdf diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/init.yml deleted file mode 100644 index 5b49f2572..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/init.yml +++ /dev/null @@ -1,19 +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-ha.infra - - cluster.mcp-pike-ovs-dpdk-ha.openstack -parameters: - _param: - cluster_name: mcp-pike-ovs-dpdk-ha - linux: - system: - service: - apt-daily.timer: - status: dead diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/init_vcp.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/init_vcp.yml.j2 deleted file mode 100644 index 9e85995bc..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/init_vcp.yml.j2 +++ /dev/null @@ -1,12 +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 -############################################################################## ---- -{%- if conf.MCP_VCP %} -classes: - - cluster.mcp-pike-ovs-dpdk-ha.infra -{%- endif %} diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/kvm.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/kvm.yml.j2 deleted file mode 100644 index b62118d4a..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/kvm.yml.j2 +++ /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 -############################################################################## ---- -{%- if conf.MCP_VCP %} -# NOTE(armband): we don't want to pull in salt.control for novcp -classes: - - cluster.mcp-pike-common-ha.infra.kvm - - cluster.mcp-pike-ovs-dpdk-ha.infra -{%- endif %} diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/maas.yml deleted file mode 100644 index f472885e2..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/maas.yml +++ /dev/null @@ -1,11 +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-ha.infra.maas - - cluster.mcp-pike-ovs-dpdk-ha.infra -- cgit 1.2.3-korg