[docker] Switch to containerized Salt Master

* Refactor OPNFV salt-formulas mechanism to resemble upstream git
  structure:
  - git submodules: add new submodule for each formula we patch;
  - create salt-formula-x directories for OPNFV formulas;
  - move mcp/metadata/service contents to their each formula subdir;
  - use `make patches-import` for patches previously handled by
    patch.sh;
  - retire patch.sh
* states: add virtual_init:
  - mostly based on old salt.sh, which is now obsolete;
  - exclude salt-master service restart (it would kill the container);
* scenarios: cleanup (rm cfg01 virtual node def), adopt virtual_init;
* reclass: align our model with prebuilt container's Salt config:
  - drop linux:network pillar data (handled by Docker);
  - stop applying linux.system state on cfg01;
  - align salt user homedir;
  - drop salt-formula packages (preprovisioned);
* minor plumbing in deploy.sh and lib.sh;

JIRA: FUEL-383

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

3 files changed, 6 insertions, 65 deletions

diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2
index a12e15663..5fa4ca486 100644
--- a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2
@@ -8,14 +8,12 @@
 {%- import 'net_map.j2' as nm with context %}
 ---
 classes:
-  - service.git.client
-  - system.linux.system.repo.mcp.salt
   - system.reclass.storage.salt
 {%- if nm.cluster.has_baremetal_nodes %}
   - system.reclass.storage.system.infra_maas_single
 {%- endif %}
   - system.salt.master.api
-  - system.salt.master.pkg
+  - system.salt.master.single
   - system.salt.minion.ca.salt_master
 parameters:
   _param:
@@ -25,6 +23,11 @@ parameters:
     salt_master_base_environment: prd
     # yamllint disable-line rule:line-length
     salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
+  linux:
+    system:
+      user:
+        salt:
+          home: /home/salt
   salt:
     master:
       accept_policy: open_mode
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 0e880c558..ee849a6cd 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/infra/config.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/infra/config.yml.j2
@@ -29,37 +29,6 @@ parameters:
     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
-          name: ${_param:single_nic}
-{%- if conf.idf.fuel.jumphost.get('trunks', {}).get('mgmt', False) and (nm.vlan_mgmt | int > 0) %}
-          proto: manual
-        single_vlan:
-          enabled: true
-          type: vlan
-          name: ${_param:single_nic}.{{ nm.vlan_mgmt }}
-          use_interfaces:
-            - ${_param:single_nic}
-{%- endif %}
-          proto: static
-          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
diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/infra/config.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/infra/config.yml.j2
index 36a2c27ec..a6bf5cda4 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/infra/config.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/infra/config.yml.j2
@@ -16,37 +16,6 @@ parameters:
     single_address: ${_param:opnfv_infra_config_address}
     salt_master_host: 127.0.0.1
     salt_minion_ca_host: ${linux:network:fqdn}
-  linux:
-    network:
-      interface:
-        mcpcontrol_int:
-          enabled: true
-          type: eth
-          proto: dhcp
-          name: ${_param:opnfv_fn_vm_primary_interface}
-        single_int:
-          enabled: true
-          name: ${_param:opnfv_fn_vm_secondary_interface}
-          type: eth
-{%- if conf.idf.fuel.jumphost.get('trunks', {}).get('mgmt', False) and (nm.vlan_mgmt | int > 0) %}
-          proto: manual
-        single_int_vlan:
-          enabled: true
-          type: vlan
-          name: ${_param:opnfv_fn_vm_secondary_interface}.{{ nm.vlan_mgmt }}
-          use_interfaces:
-            - ${_param:opnfv_fn_vm_secondary_interface}
-{%- endif %}
-          proto: static
-          address: ${_param:single_address}
-          netmask: ${_param:opnfv_net_mgmt_mask}
-        pxe_admin_int:
-          enabled: true
-          type: eth
-          proto: static
-          name: ${_param:opnfv_fn_vm_tertiary_interface}
-          address: ${_param:opnfv_infra_config_pxe_admin_address}
-          netmask: ${_param:opnfv_net_admin_mask}
   salt:
     master:
       file_recv: true