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-ovs-dpdk-ha/infra | |
| 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-ovs-dpdk-ha/infra')
5 files changed, 68 insertions, 0 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/infra/config.yml new file mode 100644 index 000000000..6c14d916a --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/infra/config.yml @@ -0,0 +1,12 @@ +############################################################################## +# 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-common-ha.infra.config + - cluster.mcp-ovs-dpdk-ha.infra + - cluster.all-mcp-arch-common.infra.config_dpdk_pdf diff --git a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/infra/init.yml new file mode 100644 index 000000000..b3745b524 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/infra/init.yml @@ -0,0 +1,19 @@ +############################################################################## +# 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-common-ha.infra + - cluster.mcp-ovs-dpdk-ha.openstack +parameters: + _param: + cluster_name: mcp-ovs-dpdk-ha + linux: + system: + service: + apt-daily.timer: + status: dead diff --git a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/infra/init_vcp.yml.j2 b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/infra/init_vcp.yml.j2 new file mode 100644 index 000000000..f1636affe --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/infra/init_vcp.yml.j2 @@ -0,0 +1,12 @@ +############################################################################## +# 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-ovs-dpdk-ha.infra +{%- endif %} diff --git a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/infra/kvm.yml.j2 b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/infra/kvm.yml.j2 new file mode 100644 index 000000000..54c3a94a9 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/infra/kvm.yml.j2 @@ -0,0 +1,14 @@ +############################################################################## +# 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-common-ha.infra.kvm + - cluster.mcp-ovs-dpdk-ha.infra +{%- endif %} diff --git a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/infra/maas.yml new file mode 100644 index 000000000..f3d605494 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/infra/maas.yml @@ -0,0 +1,11 @@ +############################################################################## +# 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-common-ha.infra.maas + - cluster.mcp-ovs-dpdk-ha.infra |