[virtual] Update OpenStack version to Stein

Change-Id: I9c1e97144ffd46040d32a0edf8253fc393b73c89
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>

10 files changed, 48 insertions, 18 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 d6f4fb563..268f09ae6 100644
--- a/mcp/reclass/classes/cluster/all-mcp-arch-common/backports.yml
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/backports.yml
@@ -7,16 +7,27 @@
 ##############################################################################
 ---
 classes:
-  - system.linux.system.repo.mcp.apt_mirantis.openstack
+  - system.linux.system.repo.keystorage.mirantis_com
+  - cluster.all-mcp-arch-common.uca_repo
 parameters:
   _param:
-    backports_version: queens
+    backports_version: rocky
   linux:
     system:
       repo:
-        mirantis_openstack_backports:
+        mirantis_openstack:
           # yamllint disable-line rule:line-length
-          source: "deb ${_param:linux_system_repo_url}/openstack-${_param:backports_version}/${_param:linux_system_codename} ${_param:linux_system_codename} main"
+          source: "deb ${_param:linux_system_repo_url}/openstack-${_param:backports_version}/xenial xenial main"
           key: ${_param:linux_system_repo_mirror_mirantis_key}
           architectures: ${_param:linux_system_architecture}
           clean_file: true
+          pinning:
+            10:
+              enabled: true
+              pin: 'release o=Mirantis'
+              priority: 1101
+              package: '/jinja2|redis/'
+            20:
+              enabled: true
+              pin: 'release o=Mirantis'
+              priority: 1
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 f735a9db0..17a89f0e8 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
@@ -64,7 +64,7 @@ parameters:
             tenant_address: {{ nm.net_private | ipnet_hostaddr(pri) }}
             external_address: {{ nm.net_public | ipnet_hostaddr(pub) }}
             salt_master_host: ${_param:reclass_config_master}
-            linux_system_codename: xenial
+            linux_system_codename: bionic
 
   {#- No partial defaults, all or nothing. Defaults tuned for lf-pod2. #}
   {%- if '-ovs-' in conf.MCP_DEPLOY_SCENARIO or '-fdio-' in conf.MCP_DEPLOY_SCENARIO %}
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 cd8b2fb6a..f9c2f20ec 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
@@ -13,7 +13,7 @@ classes:
   - cluster.all-mcp-arch-common.passwords
 parameters:
   _param:
-    openstack_version: rocky
+    openstack_version: stein
     armband_repo_version: ${_param:openstack_version}
     mcp_version: nightly
 
diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/uca_repo.yml b/mcp/reclass/classes/cluster/all-mcp-arch-common/uca_repo.yml
index 9c806560f..2ca6f01d4 100644
--- a/mcp/reclass/classes/cluster/all-mcp-arch-common/uca_repo.yml
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/uca_repo.yml
@@ -12,7 +12,7 @@ parameters:
       repo:
         uca:
           # yamllint disable-line rule:line-length
-          source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/${_param:openstack_version} main"
+          source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu ${_param:linux_system_codename}-updates/${_param:openstack_version} main"
           key: |
             -----BEGIN PGP PUBLIC KEY BLOCK-----
             Version: GnuPG v1
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 677be2859..90e6ffc8d 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
@@ -30,7 +30,7 @@ parameters:
           classes:
             - cluster.${_param:cluster_name}.openstack.control
           params:
-            linux_system_codename: xenial
+            linux_system_codename: bionic
             salt_master_host: ${_param:reclass_config_master}
             single_address: ${_param:openstack_control_node01_address}
             pxe_admin_address: ${_param:opnfv_openstack_control_node01_pxe_admin_address}
diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml
index 8fd9db050..edaf5190a 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml
@@ -19,8 +19,6 @@ classes:
   - cluster.all-mcp-arch-common.backports
   - cluster.mcp-common-noha.openstack_compute_pdf
 parameters:
-  _param:
-    linux_system_codename: xenial
   nova:
     compute:
       libvirt_service: libvirtd
@@ -39,6 +37,11 @@ parameters:
         enabled: ${_param:barbican_integration_enabled}
       image:
         verify_glance_signatures: false
+      pkgs:
+        - nova-compute
+        - python3-novaclient
+        - pm-utils
+        - sysfsutils
   neutron:
     compute:
       notification: true
@@ -67,6 +70,11 @@ parameters:
         host: ${_param:cluster_local_address}
       barbican:
         enabled: ${_param:barbican_integration_enabled}
+      pkgs:
+        - cinder-volume
+      openiscsi_services:
+        - tgt
+        - iscsid
   nfs:
     client:
       mount:
diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
index cf09d593b..eb80d7831 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
@@ -50,6 +50,7 @@ classes:
   - system.aodh.server.single
   - system.gnocchi.server.single
   - service.panko.server.single
+  - system.apache.server.site.aodh
   - system.apache.server.site.gnocchi
   - system.apache.server.site.panko
   - system.apache.server.site.barbican
@@ -66,7 +67,6 @@ classes:
   - cluster.mcp-common-noha.openstack_control_pdf
 parameters:
   _param:
-    linux_system_codename: xenial
     ceilometer_create_gnocchi_resources: 'True'
     ceilometer_endpoint_status: absent
     barbican_integration_enabled: 'false'
@@ -120,14 +120,19 @@ parameters:
         enabled: ${_param:barbican_integration_enabled}
       identity:
         barbican_endpoint: ${barbican:server:host_href}
+      pkgs:
+        - glance
+      services:
+        - glance-api
   cinder:
     controller:
       barbican:
         enabled: ${_param:barbican_integration_enabled}
+      pkgs:
+        - cinder-api
+        - cinder-scheduler
   nova:
     controller:
-      networking: dvr
-      cpu_allocation: 54
       metadata:
         password: ${_param:metadata_password}
       bind:
@@ -138,6 +143,13 @@ parameters:
       workers: 1
       barbican:
         enabled: ${_param:barbican_integration_enabled}
+      pkgs:
+        - nova-api
+        - nova-conductor
+        - nova-consoleauth
+        - nova-scheduler
+        - nova-novncproxy
+        - python3-novaclient
   horizon:
     server:
       # yamllint disable-line rule:truthy
@@ -198,6 +210,8 @@ parameters:
       global_physnet_mtu: ${_param:interface_mtu}
       backend:
         external_mtu: ${_param:interface_mtu}
+      pkgs:
+        - neutron-server
 {%- if '-bgpvpn-' in conf.MCP_DEPLOY_SCENARIO %}
       bgp_vpn:
         enabled: True
@@ -215,6 +229,7 @@ parameters:
           <<: *wsgi_threads
         barbican_admin:
           <<: *wsgi_threads
+      mod_wsgi: libapache2-mod-wsgi-py3
   barbican:
     server:
       ks_notifications_enable: true
diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml
index 5100add1f..e59263c99 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml
@@ -10,8 +10,6 @@ classes:
   - cluster.all-mcp-arch-common.backports
   - cluster.mcp-common-noha.openstack_gateway_pdf
 parameters:
-  _param:
-    linux_system_codename: xenial
   neutron:
     gateway:
       notification: true
diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/infra/config.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-noha/infra/config.yml.j2
index 9e7dda947..9b84a84b7 100644
--- a/mcp/reclass/classes/cluster/mcp-odl-noha/infra/config.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-odl-noha/infra/config.yml.j2
@@ -20,7 +20,7 @@ parameters:
           classes:
             - cluster.${_param:cluster_name}.opendaylight.control
           params:
-            linux_system_codename: xenial
+            linux_system_codename: bionic
             single_address: ${_param:opendaylight_service_host}
             pxe_admin_address: ${_param:opnfv_opendaylight_server_node01_pxe_admin_address}
         openstack_gateway_node01:
diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2
index 0c504a264..916219576 100644
--- a/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2
@@ -13,8 +13,6 @@ classes:
   - cluster.mcp-odl-noha
   - cluster.mcp-odl-noha.opendaylight.control_pdf
 parameters:
-  _param:
-    linux_system_codename: xenial
   opendaylight:
     server:
       odl_bind_ip: ${_param:single_address}