diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-17 18:12:25 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-18 22:30:22 +0000 |
| commit | f0dbe42bdb6739e30b018f4aff33d2fe75befc5a (patch) | |
| tree | 039c68e9e7886e8198578973c6e6ee46f2bbedac /mcp/reclass/classes/cluster/all-mcp-ocata-common | |
| parent | 0d8c30e7544a801af6303fb037dfa90ec074c8fd (diff) | |
[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 <Alexandru.Avadanii@enea.com>
(cherry picked from commit c360b972649028d2613fc8561899c2c8b7f71832)
Diffstat (limited to 'mcp/reclass/classes/cluster/all-mcp-ocata-common')
3 files changed, 1 insertions, 12 deletions
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 |