From f0dbe42bdb6739e30b018f4aff33d2fe75befc5a Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 17 Oct 2017 18:12:25 +0200 Subject: [baremetal] PDF-based network config This change extends current PDF/IDF support with: - dynamic interface / vlan definition; - dynamic interface and/or bridge allocation of installer networks on top of interfaces (physical or vlans); This allows us to drop hardcoded interface names and vlan / bridge configuration in favor of a runtime determined model based on PDF/IDF. For now, we duplicate common jinja variable definitions in each template, but this will later be moved to a common include file. JIRA: FUEL-275 Change-Id: Ia80a66dbdf898b0bd0a4fb99d069ce9ebe33fa65 Signed-off-by: Alexandru Avadanii (cherry picked from commit c360b972649028d2613fc8561899c2c8b7f71832) --- mcp/config/labs/local/idf-pod1.yaml | 23 +++++ ...PDF-generate_config-Fix-abspath-for-j-arg.patch | 39 ++++++++ mcp/reclass/classes/cluster/.gitignore | 4 + .../cluster/all-mcp-ocata-common/aarch64/init.yml | 6 -- .../opnfv/runtime.yml.template | 1 + .../cluster/all-mcp-ocata-common/x86_64/init.yml | 6 -- .../baremetal-mcp-ocata-common/infra/kvm.yml | 36 +------ .../infra/kvm_init.yml.j2 | 90 +++++++++++++++++ .../openstack_compute.yml | 51 +--------- .../openstack_compute_init.yml.j2 | 107 +++++++++++++++++++++ .../openstack/compute.yml | 25 +---- .../openstack/compute_init.yml.j2 | 79 +++++++++++++++ .../infra/config.yml | 13 +-- .../infra/config_init.yml.j2 | 54 +++++++++++ .../openstack/compute.yml | 27 +----- .../openstack/compute_init.yml.j2 | 79 +++++++++++++++ 16 files changed, 481 insertions(+), 159 deletions(-) create mode 100644 mcp/patches/pharos/0002-PDF-generate_config-Fix-abspath-for-j-arg.patch create mode 100644 mcp/reclass/classes/cluster/.gitignore create mode 100644 mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm_init.yml.j2 create mode 100644 mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute_init.yml.j2 create mode 100644 mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute_init.yml.j2 create mode 100644 mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config_init.yml.j2 create mode 100644 mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute_init.yml.j2 (limited to 'mcp') diff --git a/mcp/config/labs/local/idf-pod1.yaml b/mcp/config/labs/local/idf-pod1.yaml index 95af596a4..4ee359f88 100644 --- a/mcp/config/labs/local/idf-pod1.yaml +++ b/mcp/config/labs/local/idf-pod1.yaml @@ -17,3 +17,26 @@ idf: mgmt: 'br-ctl' private: '' public: '' + network: + node: + # Ordered-list, index should be in sync with node index in PDF + - interfaces: &interfaces + # Ordered-list, index should be in sync with interface index in PDF + - 'enp6s0' + - 'enp7s0' + - 'enp8s0' + - 'enp9s0' + busaddr: &busaddr + # Bus-info reported by `ethtool -i ethX` + - '0000:06:00.0' + - '0000:07:00.0' + - '0000:08:00.0' + - '0000:09:00.0' + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr diff --git a/mcp/patches/pharos/0002-PDF-generate_config-Fix-abspath-for-j-arg.patch b/mcp/patches/pharos/0002-PDF-generate_config-Fix-abspath-for-j-arg.patch new file mode 100644 index 000000000..da6e2166b --- /dev/null +++ b/mcp/patches/pharos/0002-PDF-generate_config-Fix-abspath-for-j-arg.patch @@ -0,0 +1,39 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: 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 +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +From: Alexandru Avadanii +Date: Tue, 17 Oct 2017 18:21:07 +0200 +Subject: [PATCH] PDF: generate_config: Fix abspath for '-j' arg + +Change-Id: I8a9076e7965bfd2bee7d298eb8e3b11e62ae66e7 +Signed-off-by: Alexandru Avadanii +--- + config/utils/generate_config.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/config/utils/generate_config.py b/config/utils/generate_config.py +index 18af98d..22a27d3 100755 +--- a/config/utils/generate_config.py ++++ b/config/utils/generate_config.py +@@ -38,7 +38,7 @@ def dpkg_arch(arch, to_dpkg=True): + else: + return ARCH_DPKG_TABLE[arch] + +-ENV = Environment(loader=FileSystemLoader('./')) ++ENV = Environment(loader=FileSystemLoader(os.path.dirname(ARGS.jinja2))) + ENV.filters['ipaddr_index'] = ipaddr_index + ENV.filters['dpkg_arch'] = dpkg_arch + +@@ -56,6 +56,6 @@ if os.path.exists(IDF_PATH): + # print(DICT) + + # Render template and print generated conf to console +-TEMPLATE = ENV.get_template(ARGS.jinja2) ++TEMPLATE = ENV.get_template(os.path.basename(ARGS.jinja2)) + #pylint: disable=superfluous-parens + print(TEMPLATE.render(conf=DICT)) diff --git a/mcp/reclass/classes/cluster/.gitignore b/mcp/reclass/classes/cluster/.gitignore new file mode 100644 index 000000000..57793d934 --- /dev/null +++ b/mcp/reclass/classes/cluster/.gitignore @@ -0,0 +1,4 @@ +baremetal-mcp-ocata-common/infra/kvm_init.yml +baremetal-mcp-ocata-common/openstack_compute_init.yml +baremetal-mcp-ocata-ovs-dpdk-ha/infra/config_init.yml +baremetal-mcp-ocata-*/openstack/compute_init.yml diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml index 1e5364abd..c698bba5d 100644 --- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml +++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml @@ -20,9 +20,3 @@ parameters: # NOTE(armband): Only x86 VCP VMs spawned via salt.control names differ opnfv_vcp_vm_primary_interface: ${_param:opnfv_fn_vm_primary_interface} opnfv_vcp_vm_secondary_interface: ${_param:opnfv_fn_vm_secondary_interface} - - # Baremetal interface names (target nodes) - opnfv_baremetal_primary_nic: eth0 - opnfv_baremetal_secondary_nic: eth1 - opnfv_baremetal_tertiary_nic: eth2 # not used in current reclass model - opnfv_baremetal_quaternary_nic: eth3 # not used in current reclass model diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template index d0c6684b0..cbd47ef80 100644 --- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template +++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template @@ -5,6 +5,7 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## +--- parameters: _param: reclass_config_master: ${SALT_MASTER} diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml index a9046db90..13cbbb981 100644 --- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml +++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml @@ -20,9 +20,3 @@ parameters: # NOTE(armband): Only x86 VCP VMs spawned via salt.control names differ opnfv_vcp_vm_primary_interface: ens2 opnfv_vcp_vm_secondary_interface: ens3 - - # Baremetal interface names (target nodes) - opnfv_baremetal_primary_nic: enp6s0 - opnfv_baremetal_secondary_nic: enp7s0 - opnfv_baremetal_tertiary_nic: enp8s0 - opnfv_baremetal_quaternary_nic: enp9s0 # not used in current reclass model diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml index 3bd705c6c..757295a04 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml @@ -22,6 +22,7 @@ classes: # - system.salt.control.cluster.stacklight_server_cluster # - system.salt.control.cluster.stacklight_log_cluster # - system.salt.control.cluster.stacklight_telemetry_cluster + - cluster.baremetal-mcp-ocata-common.infra.kvm_init parameters: _param: linux_system_codename: xenial @@ -31,7 +32,6 @@ parameters: cluster_node03_address: ${_param:infra_kvm_node03_address} keepalived_vip_interface: br-ctl keepalived_vip_virtual_router_id: 69 - deploy_nic: ${_param:opnfv_baremetal_primary_nic} # {dhcp,single}_nic are not used, but referenced dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface} single_nic: ${_param:opnfv_vcp_vm_secondary_interface} @@ -136,37 +136,3 @@ parameters: network.remote-dio: 'On' diagnostics.client-log-level: WARNING diagnostics.brick-log-level: WARNING - linux: - network: - interface: - deploy: - enabled: true - type: eth - proto: manual - address: 0.0.0.0 - netmask: 255.255.255.0 - name: ${_param:deploy_nic} - noifupdown: true - br-mgmt: - enabled: true - proto: dhcp - type: bridge - name_servers: ${_param:opnfv_name_servers} - use_interfaces: - - ${_param:deploy_nic} - noifupdown: true - mgmt-vlan: - enabled: true - proto: manual - type: vlan - name: ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan} - use_interfaces: - - ${_param:deploy_nic} - br-ctl: - enabled: true - type: bridge - proto: static - address: ${_param:single_address} - netmask: 255.255.255.0 - use_interfaces: - - ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm_init.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm_init.yml.j2 new file mode 100644 index 000000000..08abc36f2 --- /dev/null +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm_init.yml.j2 @@ -0,0 +1,90 @@ +############################################################################## +# 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 +############################################################################## +{# NOTE: br-{mgmt,ctl} are cross-referenced, careful when changing names #} +{%- if conf.net_config is defined and conf.idf is defined -%} + {#- NOTE: Currently, we assume all cluster nodes use the same mapping -#} + + {#- Determine interface index for each network (plumbing vars) -#} + {%- set idx_admin = conf['net_config']['admin']['interface'] -%} + {%- set idx_mgmt = conf['net_config']['mgmt']['interface'] -%} + {%- set idx_private = conf['net_config']['private']['interface'] -%} + {%- set idx_public = conf['net_config']['public']['interface'] -%} + + {#- Physical interface OS name for each network (e.g. em1, enp1s0f1) -#} + {%- set node = conf['idf']['fuel']['network']['node'][0] -%} + {%- set nic_admin = node['interfaces'][idx_admin] -%} + {%- set nic_mgmt = node['interfaces'][idx_mgmt] -%} + {%- set nic_private = node['interfaces'][idx_private] -%} + {%- set nic_public = node['interfaces'][idx_public] -%} + + {#- PCI addresses (only for DPDK on private) -#} + {%- set bus_private = node['busaddr'][idx_private] -%} + + {#- VLAN for each network (only untagged 'admin' is supported by MaaS config!) -#} + {%- set vlan_admin = conf['net_config']['admin']['vlan'] -%} + {%- set vlan_mgmt = conf['net_config']['mgmt']['vlan'] -%} + {%- set vlan_private = conf['net_config']['private']['vlan'] -%} + {%- set vlan_public = conf['net_config']['public']['vlan'] -%} +{%- else -%} + {%- set nic_admin = 'enp6s0' -%} + {%- set nic_mgmt = 'enp6s0' -%} + {%- set nic_private = None -%} + {%- set nic_public = None -%} + {%- set vlan_admin = 'native' -%} + {%- set vlan_mgmt = '300' -%} + {%- set vlan_private = '1000' -%} +{%- endif -%} + +{#- Filter-out NIC duplicates by constructing a dict (used NICs only) -#} +{%- set nics = { nic_admin: True, nic_mgmt: True, nic_public: True } -%} + +{%- set vlans = { vlan_admin: nic_admin, vlan_mgmt: nic_mgmt, vlan_public: nic_public } -%} +--- +parameters: + linux: + network: + interface: +{%- for nic in nics %} + {{ nic }}: + enabled: true + type: eth + proto: manual + address: 0.0.0.0 + netmask: 255.255.255.0 + name: {{ nic }} + noifupdown: true +{%- endfor %} + +{%- for vlan in vlans %} + {%- if vlan and vlan != 'native' %} + {{ vlans[vlan] }}.{{ vlan }}: + enabled: true + proto: manual + type: vlan + name: {{ vlans[vlan] }}.{{ vlan }} + use_interfaces: + - {{ vlans[vlan] }} + {%- endif %} +{%- endfor %} + + br-mgmt: + enabled: true + proto: dhcp + type: bridge + name_servers: ${_param:opnfv_name_servers} + use_interfaces: + - {{ nic_admin }}{% if vlan_admin and vlan_admin != 'native' %}.{{ vlan_admin }}{% endif %} + noifupdown: true + br-ctl: + enabled: true + type: bridge + proto: static + address: ${_param:single_address} + netmask: 255.255.255.0 + use_interfaces: + - {{ nic_mgmt }}{% if vlan_mgmt and vlan_mgmt != 'native' %}.{{ vlan_mgmt }}{% endif %} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml index 43b08309f..7d3dcb075 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml @@ -18,6 +18,7 @@ classes: - system.cinder.volume.single - system.cinder.volume.backend.lvm - system.ceilometer.agent.cluster + - cluster.baremetal-mcp-ocata-common.openstack_compute_init parameters: _param: cluster_vip_address: ${_param:openstack_control_address} @@ -29,8 +30,6 @@ parameters: cluster_node03_hostname: ctl03 cluster_node03_address: ${_param:openstack_control_node03_address} nova_vncproxy_url: https://${_param:cluster_public_host}:6080 - mgmt_nic: ${_param:opnfv_baremetal_primary_nic} - external_nic: ${_param:opnfv_baremetal_tertiary_nic} interface_mtu: 1500 keepalived_vip_interface: br-ctl keepalived_vip_virtual_router_id: 69 @@ -53,51 +52,3 @@ parameters: sysctl: vm.dirty_ratio: 10 vm.dirty_background_ratio: 5 - network: - bridge: openvswitch - interface: - mgmt_nic: - enabled: true - type: eth - proto: dhcp - name: ${_param:mgmt_nic} - external_nic: - enabled: true - name: ${_param:external_nic} - mtu: ${_param:interface_mtu} - proto: manual - type: eth - mgmt-vlan: - enabled: true - proto: manual - type: vlan - name: ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan} - use_interfaces: - - ${_param:mgmt_nic} - br-ctl: - enabled: true - type: bridge - proto: static - address: ${_param:single_address} - netmask: 255.255.255.0 - use_interfaces: - - ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan} - br-floating: - enabled: true - type: ovs_bridge - mtu: ${_param:interface_mtu} - float-to-ex: - enabled: true - type: ovs_port - mtu: ${_param:interface_mtu} - bridge: br-floating - br-ex: - enabled: true - type: bridge - mtu: ${_param:interface_mtu} - address: ${_param:external_address} - netmask: 255.255.255.0 - use_interfaces: - - ${_param:external_nic} - use_ovs_ports: - - float-to-ex diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute_init.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute_init.yml.j2 new file mode 100644 index 000000000..687777b2c --- /dev/null +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute_init.yml.j2 @@ -0,0 +1,107 @@ +############################################################################## +# 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 +############################################################################## +{# NOTE: br-{mgmt,ctl} are cross-referenced, careful when changing names #} +{%- if conf.net_config is defined and conf.idf is defined -%} + {#- NOTE: Currently, we assume all cluster nodes use the same mapping -#} + + {#- Determine interface index for each network (plumbing vars) -#} + {%- set idx_admin = conf['net_config']['admin']['interface'] -%} + {%- set idx_mgmt = conf['net_config']['mgmt']['interface'] -%} + {%- set idx_private = conf['net_config']['private']['interface'] -%} + {%- set idx_public = conf['net_config']['public']['interface'] -%} + + {#- Physical interface OS name for each network (e.g. em1, enp1s0f1) -#} + {%- set iface_names = conf['idf']['fuel']['network']['node'][0]['interfaces'] -%} + {%- set nic_admin = iface_names[idx_admin] -%} + {%- set nic_mgmt = iface_names[idx_mgmt] -%} + {%- set nic_private = iface_names[idx_private] -%} + {%- set nic_public = iface_names[idx_public] -%} + + {#- VLAN for each network (only untagged 'admin' is supported by MaaS config!) -#} + {%- set vlan_admin = conf['net_config']['admin']['vlan'] -%} + {%- set vlan_mgmt = conf['net_config']['mgmt']['vlan'] -%} + {%- set vlan_private = conf['net_config']['private']['vlan'] -%} + {%- set vlan_public = conf['net_config']['public']['vlan'] -%} +{%- else -%} + {%- set nic_admin = 'enp6s0' -%} + {%- set nic_mgmt = 'enp6s0' -%} + {%- set nic_private = None -%} + {%- set nic_public = None -%} + {%- set vlan_admin = 'native' -%} + {%- set vlan_mgmt = '300' -%} + {%- set vlan_private = '1000' -%} +{%- endif -%} + +{#- Filter-out NIC duplicates by constructing a dict (used NICs only) -#} +{%- set nics = { nic_admin: True, nic_mgmt: True, nic_public: True} -%} + +{%- set vlans = { vlan_admin: nic_admin, vlan_mgmt: nic_mgmt, vlan_public: nic_public} -%} +--- +parameters: + linux: + network: + bridge: openvswitch + interface: +{%- for nic in nics %} + {%- if nic == nic_admin %} + {{ nic }}: + enabled: true + type: eth + proto: dhcp + name: {{ nic }} + {%- else %} + {{ nic }}: + enabled: true + type: eth + proto: manual + address: 0.0.0.0 + netmask: 255.255.255.0 + mtu: ${_param:interface_mtu} + name: {{ nic }} + {%- endif %} +{%- endfor %} + +{%- for vlan in vlans %} + {%- if vlan and vlan != 'native' %} + {{ vlans[vlan] }}.{{ vlan }}: + enabled: true + proto: manual + type: vlan + name: {{ vlans[vlan] }}.{{ vlan }} + use_interfaces: + - {{ vlans[vlan] }} + {%- endif %} +{%- endfor %} + + br-ctl: + enabled: true + type: bridge + proto: static + address: ${_param:single_address} + netmask: 255.255.255.0 + use_interfaces: + - {{ nic_mgmt }}{% if vlan_mgmt and vlan_mgmt != 'native' %}.{{ vlan_mgmt }}{% endif %} + br-floating: + enabled: true + type: ovs_bridge + mtu: ${_param:interface_mtu} + float-to-ex: + enabled: true + type: ovs_port + mtu: ${_param:interface_mtu} + bridge: br-floating + br-ex: + enabled: true + type: bridge + mtu: ${_param:interface_mtu} + address: ${_param:external_address} + netmask: 255.255.255.0 + use_interfaces: + - {{ nic_public }}{% if vlan_public and vlan_public != 'native' %}.{{ vlan_public }}{% endif %} + use_ovs_ports: + - float-to-ex diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml index 70546aa04..fb78d3467 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml @@ -8,11 +8,11 @@ --- classes: - cluster.baremetal-mcp-ocata-common.openstack_compute + - cluster.baremetal-mcp-ocata-odl-ha.openstack.compute_init - cluster.baremetal-mcp-ocata-odl-ha.infra - system.neutron.gateway.opendaylight.single parameters: _param: - tenant_nic: ${_param:opnfv_baremetal_secondary_nic} neutron_agents: - neutron-dhcp-agent - neutron-metadata-agent @@ -29,26 +29,3 @@ parameters: services: ${_param:neutron_agents} backend: router: ${_param:opendaylight_router} - linux: - network: - interface: - tenant_nic: - enabled: true - type: eth - proto: manual - name: ${_param:tenant_nic} - br-mesh: - enabled: true - type: bridge - address: ${_param:tenant_address} - netmask: 255.255.255.0 - mtu: 1500 - use_interfaces: - - ${_param:tenant_nic}.${_param:opnfv_net_tenant_vlan} - tenant-vlan: - enabled: true - proto: manual - type: vlan - name: ${_param:tenant_nic}.${_param:opnfv_net_tenant_vlan} - use_interfaces: - - ${_param:tenant_nic} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute_init.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute_init.yml.j2 new file mode 100644 index 000000000..7809bd8c8 --- /dev/null +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute_init.yml.j2 @@ -0,0 +1,79 @@ +############################################################################## +# 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 +############################################################################## +{# NOTE: br-{mgmt,ctl} are cross-referenced, careful when changing names #} +{%- if conf.net_config is defined and conf.idf is defined -%} + {#- NOTE: Currently, we assume all cluster nodes use the same mapping -#} + + {#- Determine interface index for each network (plumbing vars) -#} + {%- set idx_admin = conf['net_config']['admin']['interface'] -%} + {%- set idx_mgmt = conf['net_config']['mgmt']['interface'] -%} + {%- set idx_private = conf['net_config']['private']['interface'] -%} + {%- set idx_public = conf['net_config']['public']['interface'] -%} + + {#- Physical interface OS name for each network (e.g. em1, enp1s0f1) -#} + {%- set node = conf['idf']['fuel']['network']['node'][1] -%} + {%- set nic_admin = node['interfaces'][idx_admin] -%} + {%- set nic_mgmt = node['interfaces'][idx_mgmt] -%} + {%- set nic_private = node['interfaces'][idx_private] -%} + {%- set nic_public = node['interfaces'][idx_public] -%} + + {#- PCI addresses (only for DPDK on private) -#} + {%- set bus_private = node['busaddr'][idx_private] -%} + + {#- VLAN for each network (only untagged 'admin' is supported by MaaS config!) -#} + {%- set vlan_admin = conf['net_config']['admin']['vlan'] -%} + {%- set vlan_mgmt = conf['net_config']['mgmt']['vlan'] -%} + {%- set vlan_private = conf['net_config']['private']['vlan'] -%} + {%- set vlan_public = conf['net_config']['public']['vlan'] -%} +{%- else -%} + {%- set nic_admin = 'enp6s0' -%} + {%- set nic_mgmt = 'enp6s0' -%} + {%- set nic_private = None -%} + {%- set nic_public = None -%} + {%- set vlan_admin = 'native' -%} + {%- set vlan_mgmt = '300' -%} + {%- set vlan_private = '1000' -%} +{%- endif -%} + +{#- Filter-out NIC duplicates by constructing a dict (used NICs only) -#} +{%- set nics = { nic_private: True } -%} + +{%- set vlans = { vlan_private: nic_private } -%} +--- +parameters: + linux: + network: + interface: +{%- for nic in nics %} + {{ nic }}: + enabled: true + type: eth + proto: manual + name: {{ nic }} +{%- endfor %} + +{%- for vlan in vlans %} + {%- if vlan and vlan != 'native' %} + {{ 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: + - {{ nic_private }}{% if vlan_private and vlan_private != 'native' %}.{{ vlan_private }}{% endif %} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml index 7bd8c37f1..149fff5ff 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml @@ -9,15 +9,4 @@ classes: - cluster.baremetal-mcp-ocata-common.infra.config - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra -parameters: - reclass: - storage: - node: - openstack_compute_node01: - params: - dpdk0_name: enp7s0 - dpdk0_pci: '"0000:07:00.0"' - openstack_compute_node02: - params: - dpdk0_name: enp7s0 - dpdk0_pci: '"0000:07:00.0"' + - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra.config_init diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config_init.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config_init.yml.j2 new file mode 100644 index 000000000..5511ed774 --- /dev/null +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config_init.yml.j2 @@ -0,0 +1,54 @@ +############################################################################## +# 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 +############################################################################## +{# NOTE: br-{mgmt,ctl} are cross-referenced, careful when changing names #} +{%- if conf.net_config is defined and conf.idf is defined -%} + {#- NOTE: Currently, we assume all cluster nodes use the same mapping -#} + + {#- Determine interface index for each network (plumbing vars) -#} + {%- set idx_admin = conf['net_config']['admin']['interface'] -%} + {%- set idx_mgmt = conf['net_config']['mgmt']['interface'] -%} + {%- set idx_private = conf['net_config']['private']['interface'] -%} + {%- set idx_public = conf['net_config']['public']['interface'] -%} + + {#- Physical interface OS name for each network (e.g. em1, enp1s0f1) -#} + {%- set node = conf['idf']['fuel']['network']['node'][0] -%} + {%- set nic_admin = node['interfaces'][idx_admin] -%} + {%- set nic_mgmt = node['interfaces'][idx_mgmt] -%} + {%- set nic_private = node['interfaces'][idx_private] -%} + {%- set nic_public = node['interfaces'][idx_public] -%} + + {#- PCI addresses (only for DPDK on private) -#} + {%- set bus_private = node['busaddr'][idx_private] -%} + + {#- VLAN for each network (only untagged 'admin' is supported by MaaS config!) -#} + {%- set vlan_admin = conf['net_config']['admin']['vlan'] -%} + {%- set vlan_mgmt = conf['net_config']['mgmt']['vlan'] -%} + {%- set vlan_private = conf['net_config']['private']['vlan'] -%} + {%- set vlan_public = conf['net_config']['public']['vlan'] -%} +{%- else -%} + {%- set nic_admin = 'enp6s0' -%} + {%- set nic_mgmt = 'enp6s0' -%} + {%- set nic_private = None -%} + {%- set nic_public = None -%} + {%- set vlan_admin = 'native' -%} + {%- set vlan_mgmt = '300' -%} + {%- set vlan_private = '1000' -%} +{%- endif -%} +--- +parameters: + reclass: + storage: + node: + openstack_compute_node01: + params: + dpdk0_name: {{ nic_private }} + dpdk0_pci: '"{{ bus_private }}"' + openstack_compute_node02: + params: + dpdk0_name: {{ nic_private }} + dpdk0_pci: '"{{ bus_private }}"' diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml index e35c0fa62..128abb0e5 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml @@ -8,30 +8,5 @@ --- classes: - cluster.baremetal-mcp-ocata-common.openstack_compute + - cluster.baremetal-mcp-ocata-ovs-ha.openstack.compute_init - cluster.baremetal-mcp-ocata-ovs-ha.infra -parameters: - _param: - tenant_nic: ${_param:opnfv_baremetal_secondary_nic} - linux: - network: - interface: - tenant_nic: - enabled: true - type: eth - proto: manual - name: ${_param:tenant_nic} - br-mesh: - enabled: true - type: bridge - address: ${_param:tenant_address} - netmask: 255.255.255.0 - mtu: 1500 - use_interfaces: - - ${_param:tenant_nic}.${_param:opnfv_net_tenant_vlan} - tenant-vlan: - enabled: true - proto: manual - type: vlan - name: ${_param:tenant_nic}.${_param:opnfv_net_tenant_vlan} - use_interfaces: - - ${_param:tenant_nic} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute_init.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute_init.yml.j2 new file mode 100644 index 000000000..7acb4b4c6 --- /dev/null +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute_init.yml.j2 @@ -0,0 +1,79 @@ +############################################################################## +# 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 +############################################################################## +{# NOTE: br-{mgmt,ctl} are cross-referenced, careful when changing names #} +{%- if conf.net_config is defined and conf.idf is defined -%} + {#- NOTE: Currently, we assume all cluster nodes use the same mapping -#} + + {#- Determine interface index for each network (plumbing vars) -#} + {%- set idx_admin = conf['net_config']['admin']['interface'] -%} + {%- set idx_mgmt = conf['net_config']['mgmt']['interface'] -%} + {%- set idx_private = conf['net_config']['private']['interface'] -%} + {%- set idx_public = conf['net_config']['public']['interface'] -%} + + {#- Physical interface OS name for each network (e.g. em1, enp1s0f1) -#} + {%- set node = conf['idf']['fuel']['network']['node'][0] -%} + {%- set nic_admin = node['interfaces'][idx_admin] -%} + {%- set nic_mgmt = node['interfaces'][idx_mgmt] -%} + {%- set nic_private = node['interfaces'][idx_private] -%} + {%- set nic_public = node['interfaces'][idx_public] -%} + + {#- PCI addresses (only for DPDK on private) -#} + {%- set bus_private = node['busaddr'][idx_private] -%} + + {#- VLAN for each network (only untagged 'admin' is supported by MaaS config!) -#} + {%- set vlan_admin = conf['net_config']['admin']['vlan'] -%} + {%- set vlan_mgmt = conf['net_config']['mgmt']['vlan'] -%} + {%- set vlan_private = conf['net_config']['private']['vlan'] -%} + {%- set vlan_public = conf['net_config']['public']['vlan'] -%} +{%- else -%} + {%- set nic_admin = 'enp6s0' -%} + {%- set nic_mgmt = 'enp6s0' -%} + {%- set nic_private = None -%} + {%- set nic_public = None -%} + {%- set vlan_admin = 'native' -%} + {%- set vlan_mgmt = '300' -%} + {%- set vlan_private = '1000' -%} +{%- endif -%} + +{#- Filter-out NIC duplicates by constructing a dict (used NICs only) -#} +{%- set nics = { nic_private: True } -%} + +{%- set vlans = { vlan_private: nic_private } -%} +--- +parameters: + linux: + network: + interface: +{%- for nic in nics %} + {{ nic }}: + enabled: true + type: eth + proto: manual + name: {{ nic }} +{%- endfor %} + +{%- for vlan in vlans %} + {%- if vlan and vlan != 'native' %} + {{ 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: + - {{ nic_private }}{% if vlan_private and vlan_private != 'native' %}.{{ vlan_private }}{% endif %} -- cgit 1.2.3-korg