From efa0ac5f3f664edfbb6a6fb93d88c6f67d732417 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 6 Mar 2018 02:43:23 +0100 Subject: [PATCH] [ha] Add ovn scenario placeholder - dummy copy of os-nosdn-nofeature-ha masquerading as os-ovn-nofeature-ha scenario placeholder; JIRA: FUEL-329 Change-Id: Ic5e6d65cf057289bb13ce2fa157b6ba53d7dab80 Signed-off-by: Alexandru Avadanii --- mcp/config/scenario/os-ovn-nofeature-ha.yaml | 26 ++++++++++++ .../cluster/mcp-pike-ovn-ha/infra/config.yml | 12 ++++++ .../classes/cluster/mcp-pike-ovn-ha/infra/init.yml | 14 +++++++ .../classes/cluster/mcp-pike-ovn-ha/infra/kvm.yml | 11 +++++ .../classes/cluster/mcp-pike-ovn-ha/infra/maas.yml | 11 +++++ .../classes/cluster/mcp-pike-ovn-ha/init.yml | 12 ++++++ .../cluster/mcp-pike-ovn-ha/openstack/compute.yml | 17 ++++++++ .../mcp-pike-ovn-ha/openstack/compute_pdf.yml.j2 | 48 ++++++++++++++++++++++ .../cluster/mcp-pike-ovn-ha/openstack/control.yml | 13 ++++++ .../cluster/mcp-pike-ovn-ha/openstack/database.yml | 12 ++++++ .../cluster/mcp-pike-ovn-ha/openstack/init.yml | 13 ++++++ .../mcp-pike-ovn-ha/openstack/message_queue.yml | 12 ++++++ .../cluster/mcp-pike-ovn-ha/openstack/proxy.yml | 12 ++++++ .../mcp-pike-ovn-ha/openstack/telemetry.yml | 12 ++++++ mcp/reclass/nodes/cfg01.mcp-pike-ovn-ha.local.yml | 18 ++++++++ 15 files changed, 243 insertions(+) create mode 100644 mcp/config/scenario/os-ovn-nofeature-ha.yaml create mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovn-ha/infra/config.yml create mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovn-ha/infra/init.yml create mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovn-ha/infra/kvm.yml create mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovn-ha/infra/maas.yml create mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovn-ha/init.yml create mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/compute.yml create mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/compute_pdf.yml.j2 create mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/control.yml create mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/database.yml create mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/init.yml create mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/message_queue.yml create mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/proxy.yml create mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/telemetry.yml create mode 100644 mcp/reclass/nodes/cfg01.mcp-pike-ovn-ha.local.yml diff --git a/mcp/config/scenario/os-ovn-nofeature-ha.yaml b/mcp/config/scenario/os-ovn-nofeature-ha.yaml new file mode 100644 index 000000000..6efc11a3f --- /dev/null +++ b/mcp/config/scenario/os-ovn-nofeature-ha.yaml @@ -0,0 +1,26 @@ +############################################################################## +# 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 +############################################################################## +--- +cluster: + domain: mcp-pike-ovn-ha.local + states: + - maas + - baremetal_init + - virtual_control_plane + - openstack_ha + - networks +virtual: + nodes: + - cfg01 + - mas01 + cfg01: + vcpus: 4 + ram: 6144 + mas01: + vcpus: 4 + ram: 6144 diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/infra/config.yml new file mode 100644 index 000000000..ca7491a02 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/infra/config.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-pike-common-ha.infra.config + - cluster.mcp-pike-ovn-ha.infra + - cluster.all-mcp-arch-common.infra.config_pdf diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/infra/init.yml new file mode 100644 index 000000000..e38aa0887 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/infra/init.yml @@ -0,0 +1,14 @@ +############################################################################## +# 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-ovn-ha.openstack +parameters: + _param: + cluster_name: mcp-pike-ovs-ha diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/infra/kvm.yml new file mode 100644 index 000000000..fe8f2d472 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/infra/kvm.yml @@ -0,0 +1,11 @@ +############################################################################## +# 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.kvm + - cluster.mcp-pike-ovn-ha.infra diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/infra/maas.yml new file mode 100644 index 000000000..398768e08 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/infra/maas.yml @@ -0,0 +1,11 @@ +############################################################################## +# 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-ovn-ha.infra diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/init.yml b/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/init.yml new file mode 100644 index 000000000..69e8033c1 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/init.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.all-mcp-arch-common + - cluster.mcp-pike-ovn-ha.infra + - cluster.mcp-pike-ovn-ha.openstack diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/compute.yml new file mode 100644 index 000000000..36073827a --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-pike-ovn-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-pike-common-ha.openstack_compute + - cluster.mcp-pike-ovn-ha.openstack.compute_pdf + - cluster.mcp-pike-ovn-ha.infra +parameters: + nova: + compute: + libvirt_service: libvirtd + libvirt_bin: /etc/default/libvirtd diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/compute_pdf.yml.j2 new file mode 100644 index 000000000..a3a86723f --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/compute_pdf.yml.j2 @@ -0,0 +1,48 @@ +############################################################################## +# 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 vlans = { nm.vlan_private: 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 nm.vlan_private | int > 0 %}.{{ nm.vlan_private }}{% endif %} diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/control.yml new file mode 100644 index 000000000..96ea48ea2 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-pike-ovn-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-pike-common-ha.openstack_interface_vcp_biport + - cluster.mcp-pike-common-ha.openstack_control + - cluster.mcp-pike-ovn-ha.infra diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/database.yml b/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/database.yml new file mode 100644 index 000000000..95762ae5f --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-pike-ovn-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-pike-common-ha.openstack_interface_vcp_biport + - cluster.mcp-pike-common-ha.openstack_database + - cluster.mcp-pike-ovn-ha.infra diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/init.yml new file mode 100644 index 000000000..02cd14adb --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-pike-ovn-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-pike-common-ha.openstack_init +parameters: + _param: + neutron_tenant_network_types: "flat,vxlan" diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/message_queue.yml new file mode 100644 index 000000000..71e4a4e97 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-pike-ovn-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-pike-common-ha.openstack_interface_vcp_biport + - cluster.mcp-pike-common-ha.openstack_message_queue + - cluster.mcp-pike-ovn-ha.infra diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/proxy.yml new file mode 100644 index 000000000..775fbca26 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-pike-ovn-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-pike-common-ha.openstack_interface_vcp_triport + - cluster.mcp-pike-common-ha.openstack_proxy + - cluster.mcp-pike-ovn-ha.infra diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/telemetry.yml new file mode 100644 index 000000000..5221cfb9f --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-pike-ovn-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-pike-common-ha.openstack_interface_vcp_biport + - cluster.mcp-pike-common-ha.openstack_telemetry + - cluster.mcp-pike-ovn-ha.infra diff --git a/mcp/reclass/nodes/cfg01.mcp-pike-ovn-ha.local.yml b/mcp/reclass/nodes/cfg01.mcp-pike-ovn-ha.local.yml new file mode 100644 index 000000000..2c370db60 --- /dev/null +++ b/mcp/reclass/nodes/cfg01.mcp-pike-ovn-ha.local.yml @@ -0,0 +1,18 @@ +############################################################################## +# 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-ovn-ha.infra.config +parameters: + _param: + linux_system_codename: xenial + reclass_data_revision: master + linux: + system: + name: cfg01 + domain: mcp-pike-ovn-ha.local -- 2.16.6