From 2863443894ef312e9c5fe7db91d55970055b5ff3 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 5 Feb 2018 18:31:18 +0100 Subject: [virtual] Rename all to drop virtual prefix JIRA: FUEL-322 Change-Id: I99c4b1774a7c3afbc834a6f6e8468f7baf1bc329 Signed-off-by: Alexandru Avadanii --- .../virtual-mcp-pike-ovs-noha/infra/config.yml | 20 ----------------- .../virtual-mcp-pike-ovs-noha/infra/init.yml | 14 ------------ .../cluster/virtual-mcp-pike-ovs-noha/init.yml | 13 ----------- .../openstack/compute.yml | 24 --------------------- .../openstack/control.yml | 12 ----------- .../openstack/gateway.yml | 25 ---------------------- .../virtual-mcp-pike-ovs-noha/openstack/init.yml | 13 ----------- 7 files changed, 121 deletions(-) delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/infra/config.yml delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/infra/init.yml delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/init.yml delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/compute.yml delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/control.yml delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/gateway.yml delete 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 deleted file mode 100644 index 7a0cce317..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/infra/config.yml +++ /dev/null @@ -1,20 +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.reclass.storage.system.openstack_gateway_single - - cluster.virtual-mcp-pike-common-noha.infra.config - - cluster.virtual-mcp-pike-ovs-noha -parameters: - reclass: - storage: - node: - openstack_gateway_node01: - params: - tenant_address: ${_param:opnfv_openstack_gateway_node01_tenant_address} - external_address: ${_param:opnfv_openstack_gateway_node01_external_address} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/infra/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/infra/init.yml deleted file mode 100644 index 0f21b9161..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/infra/init.yml +++ /dev/null @@ -1,14 +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-noha.infra - -parameters: - _param: - cluster_name: 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 deleted file mode 100644 index ac8a45f5b..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/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: - - system.linux.system.single - - cluster.virtual-mcp-pike-common-noha.init_options - - cluster.virtual-mcp-pike-ovs-noha.infra - - cluster.virtual-mcp-pike-ovs-noha.openstack 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 deleted file mode 100644 index 52edf879f..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/compute.yml +++ /dev/null @@ -1,24 +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: - - service.neutron.compute.single - - 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 deleted file mode 100644 index 4e03c4b7e..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/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-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 deleted file mode 100644 index 0eec95cc4..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/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-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 deleted file mode 100644 index 19126f89d..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/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-noha.openstack_init -parameters: - _param: - neutron_tenant_network_types: "flat,vxlan" -- cgit 1.2.3-korg