From fda7372a1bffe11fc7a199ad3d4344c1b9e57e57 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Wed, 29 Nov 2017 04:47:48 +0100 Subject: PDF: reclass: Rename template file suffix to _pdf Init is a generic suffix which also collides with pre-existing files. A distinct suffix (e.g. _pdf) should be used. JIRA: FUEL-310 Change-Id: I919a5394e7ff432ee86d10bafe889aeadb181649 Signed-off-by: Alexandru Avadanii --- .../openstack/compute.yml | 2 +- .../openstack/compute_init.yml.j2 | 79 ---------------------- .../openstack/compute_pdf.yml.j2 | 79 ++++++++++++++++++++++ 3 files changed, 80 insertions(+), 80 deletions(-) delete mode 100644 mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute_init.yml.j2 create mode 100644 mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute_pdf.yml.j2 (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack') 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 79f297fe4..9973075aa 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,7 +8,7 @@ --- classes: - cluster.baremetal-mcp-ocata-common-ha.openstack_compute - - cluster.baremetal-mcp-ocata-ovs-ha.openstack.compute_init + - cluster.baremetal-mcp-ocata-ovs-ha.openstack.compute_pdf - cluster.baremetal-mcp-ocata-ovs-ha.infra parameters: nova: 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 deleted file mode 100644 index 7acb4b4c6..000000000 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute_init.yml.j2 +++ /dev/null @@ -1,79 +0,0 @@ -############################################################################## -# 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 %} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute_pdf.yml.j2 new file mode 100644 index 000000000..7acb4b4c6 --- /dev/null +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute_pdf.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