aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster/mcp-pike-ovs-ha
diff options
context:
space:
mode:
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-pike-ovs-ha')
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/config.yml12
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/init.yml14
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/init_vcp.yml.j212
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/kvm.yml.j214
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/maas.yml11
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-ovs-ha/init.yml12
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/compute.yml17
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/compute_pdf.yml.j249
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/control.yml13
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/database.yml12
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/init.yml13
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/message_queue.yml12
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/proxy.yml12
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/telemetry.yml12
14 files changed, 0 insertions, 215 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/config.yml
deleted file mode 100644
index cab196d12..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/config.yml
+++ /dev/null
@@ -1,12 +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-ha.infra.config
- - cluster.mcp-pike-ovs-ha.infra
- - cluster.all-mcp-arch-common.infra.config_pdf
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/init.yml
deleted file mode 100644
index c0c873c00..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/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-ha.infra
- - cluster.mcp-pike-ovs-ha.openstack
-parameters:
- _param:
- cluster_name: mcp-pike-ovs-ha
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/init_vcp.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/init_vcp.yml.j2
deleted file mode 100644
index 74023ce14..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/init_vcp.yml.j2
+++ /dev/null
@@ -1,12 +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
-##############################################################################
----
-{%- if conf.MCP_VCP %}
-classes:
- - cluster.mcp-pike-ovs-ha.infra
-{%- endif %}
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/kvm.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/kvm.yml.j2
deleted file mode 100644
index 0d49e5d10..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/kvm.yml.j2
+++ /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
-##############################################################################
----
-{%- if conf.MCP_VCP %}
-# NOTE(armband): we don't want to pull in salt.control for novcp
-classes:
- - cluster.mcp-pike-common-ha.infra.kvm
- - cluster.mcp-pike-ovs-ha.infra
-{%- endif %}
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/maas.yml
deleted file mode 100644
index d0aabd90f..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/maas.yml
+++ /dev/null
@@ -1,11 +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-ha.infra.maas
- - cluster.mcp-pike-ovs-ha.infra
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/init.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/init.yml
deleted file mode 100644
index a603c8450..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/init.yml
+++ /dev/null
@@ -1,12 +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.all-mcp-arch-common
- - cluster.mcp-pike-ovs-ha.infra
- - cluster.mcp-pike-ovs-ha.openstack
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/compute.yml
deleted file mode 100644
index fa815e8be..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/compute.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:
- - cluster.mcp-pike-common-ha.openstack_compute
- - cluster.mcp-pike-ovs-ha.openstack.compute_pdf
- - cluster.mcp-pike-ovs-ha.infra
-parameters:
- nova:
- compute:
- libvirt_service: libvirtd
- libvirt_bin: /etc/default/libvirtd
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2
deleted file mode 100644
index 912537f8f..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2
+++ /dev/null
@@ -1,49 +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
-##############################################################################
-{%- import 'net_map.j2' as nm with context %}
-{#- Filter-out NIC duplicates by constructing a dict (used NICs only) #}
-{%- set nics = { nm.cmp001.nic_private: True } %}
-{%- set vlan_private_start = nm.vlan_private.rsplit('-')[0] %}
-{%- set vlans = { vlan_private_start: nm.cmp001.nic_private } %}
----
-parameters:
- linux:
- network:
- interface:
-{%- for nic in nics %}
- {{ nic }}:
- enabled: true
- type: eth
- {%- if nic == nm.cmp001.nic_admin %}
- proto: dhcp
- {%- else %}
- proto: manual
- {%- endif %}
- name: {{ nic }}
-{%- endfor %}
-
-{%- for vlan in vlans %}
- {%- if vlan | int > 0 %}
- {{ vlans[vlan] }}.{{ vlan }}:
- enabled: true
- proto: manual
- type: vlan
- name: {{ vlans[vlan] }}.{{ vlan }}
- use_interfaces:
- - {{ vlans[vlan] }}
- {%- endif %}
-{%- endfor %}
-
- br-mesh:
- enabled: true
- type: bridge
- address: ${_param:tenant_address}
- netmask: 255.255.255.0
- mtu: 1500
- use_interfaces:
- - {{ nm.cmp001.nic_private }}{% if vlan_private_start | int > 0 %}.{{ vlan_private_start }}{% endif %}
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/control.yml
deleted file mode 100644
index a70a8a07f..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/control.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.neutron.control.openvswitch.cluster
- - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport
- - cluster.mcp-pike-common-ha.openstack_control
- - cluster.mcp-pike-ovs-ha.infra
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/database.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/database.yml
deleted file mode 100644
index 33c86e8c1..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/database.yml
+++ /dev/null
@@ -1,12 +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-ha.openstack_interface_vcp_biport
- - cluster.mcp-pike-common-ha.openstack_database
- - cluster.mcp-pike-ovs-ha.infra.init_vcp
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/init.yml
deleted file mode 100644
index 02cd14adb..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/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-ha.openstack_init
-parameters:
- _param:
- neutron_tenant_network_types: "flat,vxlan"
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/message_queue.yml
deleted file mode 100644
index 629b2794b..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/message_queue.yml
+++ /dev/null
@@ -1,12 +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-ha.openstack_interface_vcp_biport
- - cluster.mcp-pike-common-ha.openstack_message_queue
- - cluster.mcp-pike-ovs-ha.infra.init_vcp
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/proxy.yml
deleted file mode 100644
index 3698965f6..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/proxy.yml
+++ /dev/null
@@ -1,12 +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-ha.openstack_interface_vcp_triport
- - cluster.mcp-pike-common-ha.openstack_proxy
- - cluster.mcp-pike-ovs-ha.infra.init_vcp
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/telemetry.yml
deleted file mode 100644
index 26341ea7b..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/telemetry.yml
+++ /dev/null
@@ -1,12 +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-ha.openstack_interface_vcp_biport
- - cluster.mcp-pike-common-ha.openstack_telemetry
- - cluster.mcp-pike-ovs-ha.infra.init_vcp