aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2018-06-04 17:55:52 +0400
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-06-07 12:43:10 +0000
commitafae8d4d99d962448eb62cdd306f7a3dcda83744 (patch)
tree09d568175957ab7155c327237313f0c3e542bcac /mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha
parent78d368731c9582361cc291d5618e01702982f2b9 (diff)
[noha] Update OpenStack version to Queens
* make cluster names version-agnostic * pre-install oslo-templates formula * salt version update to 2017.7 * system reclass update Change-Id: I903895f6bcd98a1062e66e3f14d23ec04dc1b869 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha')
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/infra/config.yml21
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/infra/init.yml14
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/init.yml13
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/compute.yml35
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/control.yml17
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/gateway.yml26
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/init.yml13
7 files changed, 0 insertions, 139 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/infra/config.yml
deleted file mode 100644
index baf072fd8..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/infra/config.yml
+++ /dev/null
@@ -1,21 +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.openstack_gateway_single
- - cluster.mcp-pike-common-noha.infra.config
- - cluster.mcp-pike-ovs-dpdk-noha
- - cluster.all-mcp-arch-common.infra.config_dpdk_pdf
-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/mcp-pike-ovs-dpdk-noha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/infra/init.yml
deleted file mode 100644
index d8cb01596..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/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-noha.infra
-
-parameters:
- _param:
- cluster_name: mcp-pike-ovs-dpdk-noha
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/init.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/init.yml
deleted file mode 100644
index 8d3a7a588..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/init.yml
+++ /dev/null
@@ -1,13 +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.linux.system.single
- - cluster.mcp-pike-common-noha.init_options
- - cluster.mcp-pike-ovs-dpdk-noha.infra
- - cluster.mcp-pike-ovs-dpdk-noha.openstack
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/compute.yml
deleted file mode 100644
index 53ba74592..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/compute.yml
+++ /dev/null
@@ -1,35 +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.nova.compute.nfv.hugepages
- - system.neutron.compute.nfv.dpdk
- - service.neutron.compute.single
- - cluster.mcp-pike-common-noha.openstack_compute
- - cluster.mcp-pike-ovs-dpdk-noha
-parameters:
- neutron:
- compute:
- backend:
- tenant_network_types: ${_param:neutron_tenant_network_types}
- linux:
- network:
- interface:
- dpdk0:
- name: ${_param:dpdk0_name}
- pci: ${_param:dpdk0_pci}
- driver: ${_param:dpdk0_driver}
- enabled: true
- bridge: br-prv
- type: dpdk_ovs_port
- n_rxq: ${_param:dpdk0_n_rxq}
- br-prv:
- enabled: true
- type: dpdk_ovs_bridge
- tenant_interface:
- type: dpdk # Not a meaningful type, just match 'dpdk' for filtering
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/control.yml
deleted file mode 100644
index 4be308d0e..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/control.yml
+++ /dev/null
@@ -1,17 +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.neutron.control.openvswitch.single
- - cluster.mcp-pike-common-noha.openstack_control
- - cluster.mcp-pike-ovs-dpdk-noha
-parameters:
- neutron:
- server:
- backend:
- tenant_vlan_range: ${_param:opnfv_net_tenant_vlan}
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/gateway.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/gateway.yml
deleted file mode 100644
index e7c077528..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/gateway.yml
+++ /dev/null
@@ -1,26 +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-noha.openstack_gateway
- - service.neutron.gateway.single
- - cluster.mcp-pike-ovs-dpdk-noha
-parameters:
- neutron:
- gateway:
- backend:
- tenant_network_types: ${_param:neutron_tenant_network_types}
- linux:
- network:
- interface:
- tenant_interface:
- ovs_bridge: br-prv
- br-prv:
- enabled: true
- type: ovs_bridge
- mtu: ${_param:interface_mtu}
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/init.yml
deleted file mode 100644
index 9ef4b1b31..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/init.yml
+++ /dev/null
@@ -1,13 +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-noha.openstack_init
-parameters:
- _param:
- neutron_tenant_network_types: "flat,vlan"