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-odl-ha/infra/config.yml | 23 ---------------- .../classes/cluster/mcp-pike-odl-ha/infra/init.yml | 14 ---------- .../cluster/mcp-pike-odl-ha/infra/init_vcp.yml.j2 | 12 -------- .../cluster/mcp-pike-odl-ha/infra/kvm.yml.j2 | 32 ---------------------- .../cluster/mcp-pike-odl-ha/infra/maas.yml.j2 | 22 --------------- 5 files changed, 103 deletions(-) delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/config.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/init.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/init_vcp.yml.j2 delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml.j2 delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml.j2 (limited to 'mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra') diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/config.yml deleted file mode 100644 index b812dea89..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/config.yml +++ /dev/null @@ -1,23 +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.opendaylight_control_single - - cluster.mcp-pike-common-ha.infra.config - - cluster.mcp-pike-odl-ha.infra - - cluster.all-mcp-arch-common.infra.config_pdf -parameters: - reclass: - storage: - node: - opendaylight_control_node01: - classes: - - cluster.${_param:cluster_name}.opendaylight.control - params: - linux_system_codename: xenial - single_address: ${_param:opendaylight_server_node01_single_address} diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/init.yml deleted file mode 100644 index 419c05947..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/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-ha.infra - - cluster.mcp-pike-odl-ha.openstack -parameters: - _param: - cluster_name: mcp-pike-odl-ha diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/init_vcp.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/init_vcp.yml.j2 deleted file mode 100644 index 385326561..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-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-odl-ha.infra -{%- endif %} diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml.j2 deleted file mode 100644 index 5fc4776d9..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml.j2 +++ /dev/null @@ -1,32 +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-odl-ha.infra -parameters: - salt: - control: - size: # RAM 4096,8192,16384,32768,65536 - # Default production sizing - opendaylight.server: - cpu: 4 - ram: 8192 - disk_profile: small - net_profile: default - cluster: - internal: - node: - odl01: - name: ${_param:opendaylight_server_node01_hostname} - provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_xenial_image} - size: opendaylight.server -{%- endif %} diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml.j2 deleted file mode 100644 index 153b493ce..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml.j2 +++ /dev/null @@ -1,22 +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 -############################################################################## -{%- set cluster_arch = [] %} -{%- for node in conf.nodes %} - {%- if node.node.arch not in cluster_arch %} - {%- do cluster_arch.append(node.node.arch) %} - {%- endif %} -{%- endfor %} ---- -classes: - - cluster.mcp-pike-common-ha.infra.maas - - cluster.mcp-pike-odl-ha.infra -{%- if 'aarch64' not in cluster_arch %} -parameters: - _param: - hwe_kernel: 'ga-16.04' -{%- endif %} -- cgit 1.2.3-korg