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 --- .../virtual-mcp-pike-ovs-noha/infra/config.yml | 11 ++++++++++ .../cluster/virtual-mcp-pike-ovs-noha/init.yml | 19 ++++++++++++++++ .../openstack/compute.yml | 23 ++++++++++++++++++++ .../openstack/control.yml | 12 +++++++++++ .../openstack/gateway.yml | 25 ++++++++++++++++++++++ .../virtual-mcp-pike-ovs-noha/openstack/init.yml | 13 +++++++++++ 6 files changed, 103 insertions(+) create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/infra/config.yml create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/init.yml create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/compute.yml create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/control.yml create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/gateway.yml create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/init.yml (limited to 'mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha') diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/infra/config.yml new file mode 100644 index 000000000..dcf87774c --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/infra/config.yml @@ -0,0 +1,11 @@ +############################################################################## +# 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-noha.infra.config + - cluster.virtual-mcp-pike-ovs-noha diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/init.yml new file mode 100644 index 000000000..d217a6978 --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/init.yml @@ -0,0 +1,19 @@ +############################################################################## +# 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-noha.init_options + - cluster.virtual-mcp-pike-common-noha.infra + - cluster.virtual-mcp-pike-ovs-noha.openstack + +parameters: + _param: + cluster_domain: virtual-mcp-pike-ovs-noha.local + cluster_name: virtual-mcp-pike-ovs-noha diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/compute.yml new file mode 100644 index 000000000..11e0d522e --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/compute.yml @@ -0,0 +1,23 @@ +############################################################################## +# 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-noha.openstack_compute + - cluster.virtual-mcp-pike-ovs-noha +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-noha/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/control.yml new file mode 100644 index 000000000..4e03c4b7e --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/control.yml @@ -0,0 +1,12 @@ +############################################################################## +# 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-noha.openstack_control + - cluster.virtual-mcp-pike-ovs-noha diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/gateway.yml new file mode 100644 index 000000000..0eec95cc4 --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/gateway.yml @@ -0,0 +1,25 @@ +############################################################################## +# 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-noha.openstack_gateway + - service.neutron.gateway.single + - cluster.virtual-mcp-pike-ovs-noha +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-noha/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/init.yml new file mode 100644 index 000000000..19126f89d --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/init.yml @@ -0,0 +1,13 @@ +############################################################################## +# 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-noha.openstack_init +parameters: + _param: + neutron_tenant_network_types: "flat,vxlan" -- cgit 1.2.3-korg