diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-02-02 00:10:03 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-02-02 00:10:14 +0100 |
| commit | 6ccfee59ea7225cfc46227e7e874835dc75dc575 (patch) | |
| tree | 14b66160817b2b6151eed0dba4c7cf35fbc7ada8 /mcp/reclass/classes/cluster/all-mcp-arch-common/aarch64 | |
| parent | f74201bebff81f8719b3ffe593e8d7ded50730a8 (diff) | |
Revert "[FN VMs] remove graphics"
RHEL family virtualization tools reserve 02:00 PCI slot for VGA, even
if 'nographics' is specified when creating the VM (in case the user
wants to later hook a video card, which usually *requires* PCI slot2).
Debian systems do not follow this rule (tested with libvirt 1.x, 2.x,
3.x), hence 1st NIC lands on PCI slot 2 (and get eth name 'ens2').
To align the behavior across all possible jumpserver distros, bring
back the virtio video.
This reverts commit 738f6c3b68d1179de1ff790f9e72c25f10874da4.
Change-Id: Ifd855c12e04aec1ff0ab047b13f8081365741889
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/reclass/classes/cluster/all-mcp-arch-common/aarch64')
| -rw-r--r-- | mcp/reclass/classes/cluster/all-mcp-arch-common/aarch64/init.yml | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/aarch64/init.yml b/mcp/reclass/classes/cluster/all-mcp-arch-common/aarch64/init.yml index d8064fa4a..3b333ed7c 100644 --- a/mcp/reclass/classes/cluster/all-mcp-arch-common/aarch64/init.yml +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/aarch64/init.yml @@ -11,7 +11,13 @@ parameters: salt_control_xenial_image: salt://salt/files/control/images/base_image_opnfv_fuel_vcp.img # VMs spawned on Foundation Node / Jump Host net ifaces (max 4) - opnfv_vm_primary_interface: enp1s0 - opnfv_vm_secondary_interface: enp2s0 - opnfv_vm_tertiary_interface: enp3s0 - opnfv_vm_quaternary_interface: enp4s0 + opnfv_fn_vm_primary_interface: enp1s0 + opnfv_fn_vm_secondary_interface: enp2s0 + opnfv_fn_vm_tertiary_interface: enp3s0 + opnfv_fn_vm_quaternary_interface: enp4s0 + + # VCP VMs spawned on KVM Hosts net ifaces (max 3) + # 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} + opnfv_vcp_vm_tertiary_interface: ${_param:opnfv_fn_vm_tertiary_interface} |