diff options
author | Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-06-07 17:19:27 +0400 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-06-07 20:52:23 +0200 |
commit | bf341b7e0d7e423044827f379e4b180e9dc897a1 (patch) | |
tree | 948e8fc07d7dedfca428e8264196ec0f3b0c4641 /mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/kvm.yml.j2 | |
parent | afae8d4d99d962448eb62cdd306f7a3dcda83744 (diff) |
[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 <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/kvm.yml.j2')
-rw-r--r-- | mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/kvm.yml.j2 | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/kvm.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/kvm.yml.j2 deleted file mode 100644 index 0d49e5d10..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-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-ha.infra -{%- endif %} |