From 09dce2a2643223d66aa1ac3a0ad8feebc082f521 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 28 Nov 2017 20:27:05 +0100 Subject: Rename reclass models to add "-ha" or "-noha" Parse all reclass j2 templates, not only common + current scenario (useful when adding new scenarios later). JIRA: FUEL-310 Change-Id: I8e87af702f83c42cb8f766bf6f121449aa5f2c26 Signed-off-by: Alexandru Avadanii --- .../cluster/virtual-mcp-pike-ovs/infra/config.yml | 11 ---------- .../classes/cluster/virtual-mcp-pike-ovs/init.yml | 19 ---------------- .../virtual-mcp-pike-ovs/openstack/compute.yml | 23 -------------------- .../virtual-mcp-pike-ovs/openstack/control.yml | 12 ----------- .../virtual-mcp-pike-ovs/openstack/gateway.yml | 25 ---------------------- .../virtual-mcp-pike-ovs/openstack/init.yml | 13 ----------- 6 files changed, 103 deletions(-) delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/init.yml delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/compute.yml delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/gateway.yml delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/init.yml (limited to 'mcp/reclass/classes/cluster/virtual-mcp-pike-ovs') diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml deleted file mode 100644 index 788fd2ffd..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml +++ /dev/null @@ -1,11 +0,0 @@ -############################################################################## -# Copyright (c) 2017 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.virtual-mcp-pike-common.infra.config - - cluster.virtual-mcp-pike-ovs diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/init.yml deleted file mode 100644 index 528125b30..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/init.yml +++ /dev/null @@ -1,19 +0,0 @@ -############################################################################## -# Copyright (c) 2017 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.linux.system.single - - cluster.all-mcp-arch-common - - cluster.virtual-mcp-pike-common.init_options - - cluster.virtual-mcp-pike-common.infra - - cluster.virtual-mcp-pike-ovs.openstack - -parameters: - _param: - cluster_domain: virtual-mcp-pike-ovs.local - cluster_name: virtual-mcp-pike-ovs diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/compute.yml deleted file mode 100644 index ea64da140..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/compute.yml +++ /dev/null @@ -1,23 +0,0 @@ -############################################################################## -# Copyright (c) 2017 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.virtual-mcp-pike-common.openstack_compute - - cluster.virtual-mcp-pike-ovs -parameters: - linux: - network: - interface: - br-mesh: - enabled: true - type: bridge - proto: static - address: ${_param:tenant_address} - netmask: 255.255.255.0 - use_interfaces: - - ${_param:tenant_interface} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml deleted file mode 100644 index 070e48880..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################## -# Copyright (c) 2017 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.neutron.control.openvswitch.single - - cluster.virtual-mcp-pike-common.openstack_control - - cluster.virtual-mcp-pike-ovs diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/gateway.yml deleted file mode 100644 index fe2f01281..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/gateway.yml +++ /dev/null @@ -1,25 +0,0 @@ -############################################################################## -# Copyright (c) 2017 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.virtual-mcp-pike-common.openstack_gateway - - service.neutron.gateway.single - - cluster.virtual-mcp-pike-ovs -parameters: - linux: - network: - interface: - br-mesh: - enabled: true - type: bridge - mtu: ${_param:interface_mtu} - proto: static - address: ${_param:tenant_address} - netmask: 255.255.255.0 - use_interfaces: - - ${_param:tenant_interface} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/init.yml deleted file mode 100644 index 5a4c444de..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/init.yml +++ /dev/null @@ -1,13 +0,0 @@ -############################################################################## -# Copyright (c) 2017 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.virtual-mcp-pike-common.openstack_init -parameters: - _param: - neutron_tenant_network_types: "flat,vxlan" -- cgit 1.2.3-korg