[FN VMs] remove graphics

Since VCP VMs (created via salt formula) do not have a video
controller defined in their domain XMLs, network devices end on
different PCI slots and hence have different names assigned
(ens2+ vs foundation node VMs, which start with ens3).

To align network interface names for VMs on jumpserver vs kvm nodes,
and reduce confusion, remove the video controller from FN VMs.

This allows some cleanup:
- drop extra AArch64 args from virt-install;
- unify 'opnfv_vcp_vm_*' and 'opnfv_fn_vm_*' variables;

Change-Id: I0d108b00914b3eaaa03b67c652174f8ed4573118
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

4 files changed, 11 insertions, 11 deletions

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml
index 7e3a49491..576925e10 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml
@@ -35,7 +35,7 @@ parameters:
       interface:
         single_int:
           enabled: true
-          name: ${_param:opnfv_fn_vm_secondary_interface}
+          name: ${_param:opnfv_vm_secondary_interface}
           type: eth
           proto: static
           address: ${_param:single_address}
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_compute.yml
index da933dc27..6a1db572a 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_compute.yml
@@ -17,9 +17,9 @@ classes:
   - system.ceilometer.client.cinder_volume
 parameters:
   _param:
-    primary_interface: ${_param:opnfv_fn_vm_secondary_interface}
-    tenant_interface: ${_param:opnfv_fn_vm_tertiary_interface}
-    external_interface: ${_param:opnfv_fn_vm_quaternary_interface}
+    primary_interface: ${_param:opnfv_vm_secondary_interface}
+    tenant_interface: ${_param:opnfv_vm_tertiary_interface}
+    external_interface: ${_param:opnfv_vm_quaternary_interface}
     interface_mtu: 9000
     linux_system_codename: xenial
     loopback_device_size: 20
@@ -70,7 +70,7 @@ parameters:
       interface:
         dhcp_int:
           enabled: true
-          name: ${_param:opnfv_fn_vm_primary_interface}
+          name: ${_param:opnfv_vm_primary_interface}
           proto: dhcp
           type: eth
           mtu: ${_param:interface_mtu}
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_control.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_control.yml
index 98256745f..cb06e349d 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_control.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_control.yml
@@ -56,14 +56,14 @@ parameters:
       interface:
         single_int:
           enabled: true
-          name: ${_param:opnfv_fn_vm_secondary_interface}
+          name: ${_param:opnfv_vm_secondary_interface}
           type: eth
           proto: static
           address: ${_param:single_address}
           netmask: 255.255.255.0
         public_int:
           enabled: true
-          name: ${_param:opnfv_fn_vm_quaternary_interface}
+          name: ${_param:opnfv_vm_quaternary_interface}
           type: eth
           proto: static
           address: ${_param:cluster_public_host}
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_gateway.yml
index 9822de7d3..6d38aa82e 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_gateway.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_gateway.yml
@@ -8,9 +8,9 @@
 ---
 parameters:
   _param:
-    primary_interface: ${_param:opnfv_fn_vm_secondary_interface}
-    tenant_interface: ${_param:opnfv_fn_vm_tertiary_interface}
-    external_interface: ${_param:opnfv_fn_vm_quaternary_interface}
+    primary_interface: ${_param:opnfv_vm_secondary_interface}
+    tenant_interface: ${_param:opnfv_vm_tertiary_interface}
+    external_interface: ${_param:opnfv_vm_quaternary_interface}
     interface_mtu: 9000
     linux_system_codename: xenial
   neutron:
@@ -24,7 +24,7 @@ parameters:
       interface:
         dhcp_int:
           enabled: true
-          name: ${_param:opnfv_fn_vm_primary_interface}
+          name: ${_param:opnfv_vm_primary_interface}
           proto: dhcp
           type: eth
           mtu: ${_param:interface_mtu}