From ba8c1b13aa70b1389d00052e0f62afc886cf4b10 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sat, 20 Jan 2018 21:41:05 +0100 Subject: [lab-config] Use Pharos submodule by default - switch from securedlab to pharos as lab-config structure; - accomodate the move net_config from PDF to IDF in j2 templates; Change-Id: Ib04e4fb384568a6efd9e78a080857b663521ae88 Signed-off-by: Alexandru Avadanii --- .../baremetal-mcp-pike-common-ha/infra/kvm_pdf.yml.j2 | 18 +++++++++--------- .../openstack_compute_pdf.yml.j2 | 18 +++++++++--------- .../openstack/compute_pdf.yml.j2 | 18 +++++++++--------- .../infra/config_pdf.yml.j2 | 18 +++++++++--------- .../openstack/compute_pdf.yml.j2 | 18 +++++++++--------- 5 files changed, 45 insertions(+), 45 deletions(-) (limited to 'mcp/reclass/classes/cluster') diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm_pdf.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm_pdf.yml.j2 index b7f6b7cdc..42c3fcba4 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm_pdf.yml.j2 @@ -6,14 +6,14 @@ # 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 -%} +{%- if conf.idf is defined and conf.idf.net_config 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'] -%} + {%- set idx_admin = conf['idf']['net_config']['admin']['interface'] -%} + {%- set idx_mgmt = conf['idf']['net_config']['mgmt']['interface'] -%} + {%- set idx_private = conf['idf']['net_config']['private']['interface'] -%} + {%- set idx_public = conf['idf']['net_config']['public']['interface'] -%} {#- Physical interface OS name for each network (e.g. em1, enp1s0f1) -#} {%- set node = conf['idf']['fuel']['network']['node'][0] -%} @@ -26,10 +26,10 @@ {%- 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'] -%} + {%- set vlan_admin = conf['idf']['net_config']['admin']['vlan'] -%} + {%- set vlan_mgmt = conf['idf']['net_config']['mgmt']['vlan'] -%} + {%- set vlan_private = conf['idf']['net_config']['private']['vlan'] -%} + {%- set vlan_public = conf['idf']['net_config']['public']['vlan'] -%} {%- else -%} {%- set nic_admin = 'enp6s0' -%} {%- set nic_mgmt = 'enp6s0' -%} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute_pdf.yml.j2 index bf2b66e4f..6485fefb1 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute_pdf.yml.j2 @@ -6,14 +6,14 @@ # 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 -%} +{%- if conf.idf is defined and conf.idf.net_config 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'] -%} + {%- set idx_admin = conf['idf']['net_config']['admin']['interface'] -%} + {%- set idx_mgmt = conf['idf']['net_config']['mgmt']['interface'] -%} + {%- set idx_private = conf['idf']['net_config']['private']['interface'] -%} + {%- set idx_public = conf['idf']['net_config']['public']['interface'] -%} {#- Physical interface OS name for each network (e.g. em1, enp1s0f1) -#} {%- set iface_names = conf['idf']['fuel']['network']['node'][3]['interfaces'] -%} @@ -23,10 +23,10 @@ {%- 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'] -%} + {%- set vlan_admin = conf['idf']['net_config']['admin']['vlan'] -%} + {%- set vlan_mgmt = conf['idf']['net_config']['mgmt']['vlan'] -%} + {%- set vlan_private = conf['idf']['net_config']['private']['vlan'] -%} + {%- set vlan_public = conf['idf']['net_config']['public']['vlan'] -%} {%- else -%} {%- set nic_admin = 'enp6s0' -%} {%- set nic_mgmt = 'enp6s0' -%} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/compute_pdf.yml.j2 index 7809bd8c8..21ab8e937 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/compute_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/compute_pdf.yml.j2 @@ -6,14 +6,14 @@ # 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 -%} +{%- if conf.idf is defined and conf.idf.net_config 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'] -%} + {%- set idx_admin = conf['idf']['net_config']['admin']['interface'] -%} + {%- set idx_mgmt = conf['idf']['net_config']['mgmt']['interface'] -%} + {%- set idx_private = conf['idf']['net_config']['private']['interface'] -%} + {%- set idx_public = conf['idf']['net_config']['public']['interface'] -%} {#- Physical interface OS name for each network (e.g. em1, enp1s0f1) -#} {%- set node = conf['idf']['fuel']['network']['node'][1] -%} @@ -26,10 +26,10 @@ {%- 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'] -%} + {%- set vlan_admin = conf['idf']['net_config']['admin']['vlan'] -%} + {%- set vlan_mgmt = conf['idf']['net_config']['mgmt']['vlan'] -%} + {%- set vlan_private = conf['idf']['net_config']['private']['vlan'] -%} + {%- set vlan_public = conf['idf']['net_config']['public']['vlan'] -%} {%- else -%} {%- set nic_admin = 'enp6s0' -%} {%- set nic_mgmt = 'enp6s0' -%} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/config_pdf.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/config_pdf.yml.j2 index 5511ed774..08e8ab717 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/config_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/config_pdf.yml.j2 @@ -6,14 +6,14 @@ # 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 -%} +{%- if conf.idf is defined and conf.idf.net_config 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'] -%} + {%- set idx_admin = conf['idf']['net_config']['admin']['interface'] -%} + {%- set idx_mgmt = conf['idf']['net_config']['mgmt']['interface'] -%} + {%- set idx_private = conf['idf']['net_config']['private']['interface'] -%} + {%- set idx_public = conf['idf']['net_config']['public']['interface'] -%} {#- Physical interface OS name for each network (e.g. em1, enp1s0f1) -#} {%- set node = conf['idf']['fuel']['network']['node'][0] -%} @@ -26,10 +26,10 @@ {%- 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'] -%} + {%- set vlan_admin = conf['idf']['net_config']['admin']['vlan'] -%} + {%- set vlan_mgmt = conf['idf']['net_config']['mgmt']['vlan'] -%} + {%- set vlan_private = conf['idf']['net_config']['private']['vlan'] -%} + {%- set vlan_public = conf['idf']['net_config']['public']['vlan'] -%} {%- else -%} {%- set nic_admin = 'enp6s0' -%} {%- set nic_mgmt = 'enp6s0' -%} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2 index 7acb4b4c6..88e3117b7 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2 @@ -6,14 +6,14 @@ # 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 -%} +{%- if conf.idf is defined and conf.idf.net_config 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'] -%} + {%- set idx_admin = conf['idf']['net_config']['admin']['interface'] -%} + {%- set idx_mgmt = conf['idf']['net_config']['mgmt']['interface'] -%} + {%- set idx_private = conf['idf']['net_config']['private']['interface'] -%} + {%- set idx_public = conf['idf']['net_config']['public']['interface'] -%} {#- Physical interface OS name for each network (e.g. em1, enp1s0f1) -#} {%- set node = conf['idf']['fuel']['network']['node'][0] -%} @@ -26,10 +26,10 @@ {%- 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'] -%} + {%- set vlan_admin = conf['idf']['net_config']['admin']['vlan'] -%} + {%- set vlan_mgmt = conf['idf']['net_config']['mgmt']['vlan'] -%} + {%- set vlan_private = conf['idf']['net_config']['private']['vlan'] -%} + {%- set vlan_public = conf['idf']['net_config']['public']['vlan'] -%} {%- else -%} {%- set nic_admin = 'enp6s0' -%} {%- set nic_mgmt = 'enp6s0' -%} -- cgit 1.2.3-korg