diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-28 20:27:05 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-12-31 02:11:34 +0100 |
| commit | f30d534e080a43aed078b7aadbc4db9dab95dcf6 (patch) | |
| tree | 7d01b418ed0ea2b327b8ad63acb3ef9c08e3a4f9 /mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack | |
| parent | 565454013b305e6a95b103a37351478c0090bb6b (diff) | |
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 <Alexandru.Avadanii@enea.com>
(cherry picked from commit 09dce2a2643223d66aa1ac3a0ad8feebc082f521)
Diffstat (limited to 'mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack')
4 files changed, 0 insertions, 73 deletions
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml deleted file mode 100644 index c9fee8842..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-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-ocata-common.openstack_compute - - cluster.virtual-mcp-ocata-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-ocata-ovs/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml deleted file mode 100644 index 17250c338..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-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-ocata-common.openstack_control - - cluster.virtual-mcp-ocata-ovs diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml deleted file mode 100644 index 50c0f6e4d..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-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-ocata-common.openstack_gateway - - service.neutron.gateway.single - - cluster.virtual-mcp-ocata-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-ocata-ovs/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml deleted file mode 100644 index 4b083944a..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-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-ocata-common.openstack_init -parameters: - _param: - neutron_tenant_network_types: "flat,vxlan" |