Merge "[virtual] Parameterize scenarios based on PDF/IDF"

[fuel.git] / mcp / reclass / classes / cluster / mcp-common-ha / infra / config.yml.j2

diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/infra/config.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/infra/config.yml.j2
index f6e0baa..41d73e3 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-common-ha/infra/config.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/infra/config.yml.j2
@@ -18,40 +18,11 @@ classes:
   # - system.reclass.storage.system.stacklight_log_cluster
   # - system.reclass.storage.system.stacklight_monitor_cluster
   # - system.reclass.storage.system.stacklight_telemetry_cluster
-  - system.reclass.storage.system.infra_maas_single
-  - cluster.mcp-common-ha.include.lab_proxy_pdf
+  - cluster.all-mcp-arch-common.opnfv.lab_proxy_pdf
   - cluster.all-mcp-arch-common.infra.config_pdf
 parameters:
   _param:
     salt_master_host: ${_param:infra_config_deploy_address}
-    single_address: ${_param:infra_config_address}
-    deploy_address: ${_param:infra_config_deploy_address}
-    pxe_admin_address: ${_param:opnfv_infra_config_pxe_admin_address}
-    mcpcontrol_nic: ${_param:opnfv_fn_vm_primary_interface}
-    single_nic: ${_param:opnfv_fn_vm_secondary_interface}
-    pxe_admin_nic: ${_param:opnfv_fn_vm_tertiary_interface}
-  linux:
-    network:
-      interface:
-        mcpcontrol_int:
-          enabled: true
-          type: eth
-          proto: dhcp
-          name: ${_param:mcpcontrol_nic}
-        single:
-          enabled: true
-          type: eth
-          proto: static
-          name: ${_param:single_nic}
-          address: ${_param:single_address}
-          netmask: ${_param:opnfv_net_mgmt_mask}
-        pxe_admin_int:
-          enabled: true
-          type: eth
-          proto: static
-          name: ${_param:pxe_admin_nic}
-          address: ${_param:pxe_admin_address}
-          netmask: ${_param:opnfv_net_admin_mask}
   salt:
     master:
       accept_policy: open_mode