[baremetal] Stein, Bionic, py3 support

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

4 files changed, 43 insertions, 11 deletions

diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/backports.yml b/mcp/reclass/classes/cluster/all-mcp-arch-common/backports.yml
index e2de54dc8..04b38abae 100644
--- a/mcp/reclass/classes/cluster/all-mcp-arch-common/backports.yml
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/backports.yml
@@ -12,9 +12,41 @@ classes:
 parameters:
   _param:
     backports_version: rocky
+    fakeinitscripts_ppa_key: |
+      -----BEGIN PGP PUBLIC KEY BLOCK-----
+
+      xsFNBFwKq9ABEADqWu9anJFs3RJ87i53tU8lBC8JGa55YmRlN7LgvkPYMtXj3xOR
+      tBn8HJ3B0b2fKx2htUs+oWtFFCkNUmptnNz+tMVdwXt1lXSr2MEzO6PgBBAvak0j
+      GMLSsI4p60YqoPARMjPXvZ+VNcGZ6RSOKlNnEqSb+M76iaVaqEWBipDR1g+llCd9
+      lgUVQ8iKolw+5iCnPnjmm0GdE9iw7Az0aUIv3yXNaEZwnGb9egdoioY4OvkY9HqR
+      KkgsrTVBWiTOsoDctrPkLNsB1BZLA/Qkgv4Sih2Bc7atgid6SvvuGClex+9MdBPQ
+      r0nT03O0uiXQ4Zk/ULlXaE2ci9dhMD5SNspgZnEULcubqL/Xd2iq6DlW22iXmj2X
+      PSoF6YxrtxlocaC2ChKFGITR7yiudxDYSCyBzXBMP7zfLVwZC3IX309HaxJRPCk5
+      PEatmq0++z3lWfNXEjQ48Rt0mYTC5ktcJQGpSSp30hjrIfz5Jxa/FACQCJBGbr0/
+      jO6cB6TJpHDnwdsEvCLJmeI6+OYkEzExarL8Wg8DdQUo5uppS4zANAgMsUbVqFz5
+      7WDlLMKPRAheEdZJIwCHXZrB3TibZTNUuafmQD+4a50cfKgNHlb+ks/5gbkxRdNj
+      DdZYI6gbh7PZcvIKOvakrEer8RIpqgSXyWPxIviyCGpp/+webUyapFwstQARAQAB
+      zRxMYXVuY2hwYWQgUFBBIGZvciBPUE5GViBGdWVswsF4BBMBAgAiBQJcCqvQAhsD
+      BgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRCVWdwe/i1a+JgbEADZPwsdXStw
+      kqS+bg+bL4sCK55LnYAPWWnqXLuqpEEXusuGYEyahu69SOidL3/AXY1iM9FnbBE0
+      qyycLQVOv/lt7Bs1WVg7M3gNjTsnCH7RbZsGVWDnOuZ1G0KP2o72dmrR9GYFArHA
+      MMc3YVoKAWhRBWHUKdSp/D68i/cfJ4V1PNhDpchOz4ytPjo2xyHyBW+wxLxNiC32
+      3uZeT7EpO8UbhuFDd3+PLaNrI1p2mkYxdmTpVBLIdKdAMq1QYi0B1nLvJ7Cp2yck
+      2HKrI6pb74l7dkQOxx+x/inAMbZKX/AvKSjzyJ+Fxc4TT28m79QLuHtORiaPWCep
+      HePcl/0Qu2n85qOtWbWFWCJwlmvfTkHw2u7PEjutTgX9zOLdEFliu3v9nhvec7Mk
+      AzwpilBD6eAHav8Yhx6CKNR5GReK3viJ8+lso/D/56ap7el+W+M6K59imJ/r8WVx
+      79qPXTAB29Co8hC5ky2qqeHMHw39VqC/JpCYPjH7qZNyWWhXBwHcobktuCc+tXdq
+      t1qlTz0aU/DLGUW8Buk9R6ZZTvSUibT8tRqDYtVhyJ7u/2qCdqhFoculWr6e6DQF
+      KP41NGKN4LtqQh7HmFCswvBnlu7BpkVlBqlHEMpqRUbJd7fg0oGkEf6P8hhWwdd2
+      0keWK/lCMRHDEN6+/1ppP7M90/JyUPXfFA==
+      =stQK
+      -----END PGP PUBLIC KEY BLOCK-----
   linux:
     system:
       repo:
+        opnfv_fakeinitscripts:
+          source: "deb http://ppa.launchpad.net/opnfv-fuel/fakeinitscripts/ubuntu ${_param:linux_system_codename} main"
+          key: ${_param:fakeinitscripts_ppa_key}
         mirantis_openstack:
           # yamllint disable-line rule:line-length
           source: "deb ${_param:linux_system_repo_url}/openstack-${_param:backports_version}/xenial xenial main"
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 17a89f0e8..1178843d9 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
@@ -24,6 +24,7 @@ parameters:
     salt_master_base_environment: prd
     # yamllint disable-line rule:line-length
     salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
+    infra_maas_system_codename: bionic
   linux:
     system:
       user:
diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2
index fa85ab79c..b5cb3fece 100644
--- a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2
@@ -16,11 +16,11 @@ classes:
   - cluster.all-mcp-arch-common.opnfv.pod_config
 parameters:
   _param:
-    linux_system_codename: xenial
+    linux_system_codename: bionic
     maas_admin_username: opnfv
     dns_server01: '{{ nm.dns_public[0] }}'
     single_address: ${_param:infra_maas_node01_deploy_address}
-    hwe_kernel: 'hwe-16.04'
+    hwe_kernel: 'ga-18.04'
     opnfv_maas_timeout_comissioning: {{ nm.maas_timeout_comissioning }}
     opnfv_maas_timeout_deploying: {{ nm.maas_timeout_deploying }}
   maas:
@@ -43,7 +43,7 @@ parameters:
           url: http://images.maas.io/ephemeral-v3/daily
           keyring_file: /usr/share/keyrings/ubuntu-cloudimage-keyring.gpg
       boot_sources_selections:
-        xenial:
+        bionic:
           url: "http://images.maas.io/ephemeral-v3/daily"
           os: "ubuntu"
           release: "${_param:linux_system_codename}"
@@ -53,8 +53,7 @@ parameters:
 {%- endfor %}
           subarches:
             - "generic"
-            - "ga-16.04"
-            - "hwe-16.04"
+            - "ga-18.04"
           labels: '"*"'
       fabrics:
         pxe_admin:
@@ -85,7 +84,7 @@ parameters:
         armband:
           name: armband
           enabled: '1'
-          url: 'http://linux.enea.com/mcp-repos/${_param:armband_repo_version}/${_param:linux_system_codename}'
+          url: 'http://linux.enea.com/mcp-repos/${_param:armband_repo_version}/xenial'
           distributions: '${_param:armband_repo_version}-armband'
           components: 'main'
           arches: 'arm64'
@@ -98,8 +97,8 @@ parameters:
         active_discovery_interval: 600
         ntp_external_only: true
         upstream_dns: ${_param:dns_server01}
-        commissioning_distro_series: 'xenial'
-        default_distro_series: 'xenial'
+        commissioning_distro_series: 'bionic'
+        default_distro_series: 'bionic'
         default_osystem: 'ubuntu'
         default_storage_layout: 'lvm'
         enable_http_proxy: true
@@ -109,7 +108,7 @@ parameters:
         network_discovery: 'enabled'
         default_min_hwe_kernel: ${_param:hwe_kernel}
     cluster:
-      saltstack_repo_xenial: "deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2017.7/ xenial main"
+      saltstack_repo_bionic: "deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/18.04/amd64/2017.7/ bionic main"
       region:
         host: ${_param:single_address}
         port: 5240
diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2
index f9c2f20ec..fc5bbaa7b 100644
--- a/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2
@@ -14,13 +14,13 @@ classes:
 parameters:
   _param:
     openstack_version: stein
-    armband_repo_version: ${_param:openstack_version}
+    armband_repo_version: rocky
     mcp_version: nightly
 
     banner_company_name: OPNFV
 
     salt_control_trusty_image: ''  # Dummy value, to keep reclass 1.5.2 happy
-    salt_control_xenial_image: salt://salt/files/control/images/base_image_opnfv_fuel_vcp.img
+    salt_control_bionic_image: salt://salt/files/control/images/base_image_opnfv_fuel_vcp.img
 
     # VCP VMs spawned on KVM Hosts net ifaces (max 3)
 {%- if conf.MCP_JUMP_ARCH == 'aarch64' %}