From bf341b7e0d7e423044827f379e4b180e9dc897a1 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Thu, 7 Jun 2018 17:19:27 +0400 Subject: [ha] Update OpenStack version to Queens * make cluster names version-agnostic * switch to mirror.mirantis.com * system reclass update Change-Id: I96394b3c9d8d38321289af8e3a4e8bbc5dd7a408 Signed-off-by: Michael Polenchuk --- .../cluster/mcp-ovs-ha/openstack/compute.yml | 17 ++++++++ .../mcp-ovs-ha/openstack/compute_pdf.yml.j2 | 49 ++++++++++++++++++++++ .../cluster/mcp-ovs-ha/openstack/control.yml | 13 ++++++ .../cluster/mcp-ovs-ha/openstack/database.yml | 12 ++++++ .../classes/cluster/mcp-ovs-ha/openstack/init.yml | 13 ++++++ .../cluster/mcp-ovs-ha/openstack/message_queue.yml | 12 ++++++ .../classes/cluster/mcp-ovs-ha/openstack/proxy.yml | 12 ++++++ .../cluster/mcp-ovs-ha/openstack/telemetry.yml | 12 ++++++ 8 files changed, 140 insertions(+) create mode 100644 mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/compute.yml create mode 100644 mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/compute_pdf.yml.j2 create mode 100644 mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/control.yml create mode 100644 mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/database.yml create mode 100644 mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/init.yml create mode 100644 mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/message_queue.yml create mode 100644 mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/proxy.yml create mode 100644 mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/telemetry.yml (limited to 'mcp/reclass/classes/cluster/mcp-ovs-ha/openstack') diff --git a/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/compute.yml new file mode 100644 index 000000000..1e157cfa7 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/compute.yml @@ -0,0 +1,17 @@ +############################################################################## +# 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-common-ha.openstack_compute + - cluster.mcp-ovs-ha.openstack.compute_pdf + - cluster.mcp-ovs-ha.infra +parameters: + nova: + compute: + libvirt_service: libvirtd + libvirt_bin: /etc/default/libvirtd diff --git a/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/compute_pdf.yml.j2 new file mode 100644 index 000000000..7cf4c8864 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/compute_pdf.yml.j2 @@ -0,0 +1,49 @@ +############################################################################## +# 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 | string).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-ovs-ha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/control.yml new file mode 100644 index 000000000..47257e0ff --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/control.yml @@ -0,0 +1,13 @@ +############################################################################## +# 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-common-ha.openstack_interface_vcp_biport + - cluster.mcp-common-ha.openstack_control + - cluster.mcp-ovs-ha.infra diff --git a/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/database.yml b/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/database.yml new file mode 100644 index 000000000..c0002d9c1 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/database.yml @@ -0,0 +1,12 @@ +############################################################################## +# 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-common-ha.openstack_interface_vcp_biport + - cluster.mcp-common-ha.openstack_database + - cluster.mcp-ovs-ha.infra.init_vcp diff --git a/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/init.yml new file mode 100644 index 000000000..9dbfd59a1 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/init.yml @@ -0,0 +1,13 @@ +############################################################################## +# 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-common-ha.openstack_init +parameters: + _param: + neutron_tenant_network_types: "flat,vxlan" diff --git a/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/message_queue.yml new file mode 100644 index 000000000..3fe3c0eaa --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/message_queue.yml @@ -0,0 +1,12 @@ +############################################################################## +# 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-common-ha.openstack_interface_vcp_biport + - cluster.mcp-common-ha.openstack_message_queue + - cluster.mcp-ovs-ha.infra.init_vcp diff --git a/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/proxy.yml new file mode 100644 index 000000000..27120ffe3 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/proxy.yml @@ -0,0 +1,12 @@ +############################################################################## +# 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-common-ha.openstack_interface_vcp_triport + - cluster.mcp-common-ha.openstack_proxy + - cluster.mcp-ovs-ha.infra.init_vcp diff --git a/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/telemetry.yml new file mode 100644 index 000000000..161eb9f1e --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/telemetry.yml @@ -0,0 +1,12 @@ +############################################################################## +# 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-common-ha.openstack_interface_vcp_biport + - cluster.mcp-common-ha.openstack_telemetry + - cluster.mcp-ovs-ha.infra.init_vcp -- cgit 1.2.3-korg