[virtual] Update OpenStack version to Stein

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

43 files changed, 190 insertions, 261 deletions

diff --git a/.gitmodules b/.gitmodules
index b47167d9d..b7437e574 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -66,3 +66,23 @@
 	path = mcp/salt-formulas/salt-formula-apache
 	url = https://gerrit.mcp.mirantis.com/salt-formulas/apache
 	branch = master
+[submodule "salt-formula-aodh"]
+	path = mcp/salt-formulas/salt-formula-aodh
+	url = https://gerrit.mcp.mirantis.com/salt-formulas/aodh
+	branch = master
+[submodule "salt-formula-panko"]
+	path = mcp/salt-formulas/salt-formula-panko
+	url = https://gerrit.mcp.mirantis.com/salt-formulas/panko
+	branch = master
+[submodule "salt-formula-barbican"]
+	path = mcp/salt-formulas/salt-formula-barbican
+	url = https://gerrit.mcp.mirantis.com/salt-formulas/barbican
+	branch = master
+[submodule "salt-formula-ceilometer"]
+	path = mcp/salt-formulas/salt-formula-ceilometer
+	url = https://gerrit.mcp.mirantis.com/salt-formulas/ceilometer
+	branch = master
+[submodule "salt-formula-glance"]
+	path = mcp/salt-formulas/salt-formula-glance
+	url = https://gerrit.mcp.mirantis.com/salt-formulas/glance
+	branch = master
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 7443753a7..f87bfce24 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -105,7 +105,7 @@ $(notify_i "Input parameters to the build script are:" 2)
    control plane directly on baremetal nodes
 -o Operating system to be preinstalled on jumpserver VMs (for virtual/hybrid
    deployments) and/or VCP VMs (for baremetal deployments).
-   Defaults to 'ubuntu1604' (Xenial).
+   Defaults to 'ubuntu1804' (Bionic).
 -P Skip installing dependency distro packages on current host
    This flag should only be used if you have kept back older packages that
    would be upgraded and that is undesirable on the current system.
@@ -153,7 +153,7 @@ ERASE_ENV=${ERASE_ENV:-0}
 MCP_VCP=${MCP_VCP:-1}
 MCP_DOCKER_TAG=${MCP_DOCKER_TAG:-${DEF_DOCKER_TAG}}
 MCP_CMP_SS=${MCP_CMP_SS:-0}
-MCP_OS=${MCP_OS:-ubuntu1604}
+MCP_OS=${MCP_OS:-ubuntu1804}
 
 source "${DEPLOY_DIR}/globals.sh"
 source "${DEPLOY_DIR}/lib.sh"
diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha
index f79d9f657..cb6059d9e 100755
--- a/mcp/config/states/openstack_noha
+++ b/mcp/config/states/openstack_noha
@@ -46,6 +46,12 @@ salt -I 'nova:compute' state.sls nova,armband
 salt -I 'barbican:server' state.sls barbican
 salt -I 'barbican:client' state.sls barbican
 
+# remove config files coming from packages
+for service in gnocchi panko; do
+  salt -I "${service}:server" pkg.install ${service}-api
+  salt -I "${service}:server" file.remove "/etc/apache2/sites-enabled/${service}-api.conf"
+done
+
 salt -I 'redis:server' state.sls redis
 salt -I 'gnocchi:server' state.sls gnocchi
 salt -I 'panko:server' state.sls panko
diff --git a/mcp/config/states/virtual_init b/mcp/config/states/virtual_init
index 77f4f5494..b5bb18955 100755
--- a/mcp/config/states/virtual_init
+++ b/mcp/config/states/virtual_init
@@ -36,8 +36,8 @@ if [[ "${base_image}" =~ centos ]]; then
   EXCLUDE_IDS="exclude='[{id: linux_kernel_net.core.netdev_budget_usecs}]'"
 fi
 wait_for 3.0 "salt -C 'E@^(${NODE_MASK}).*' state.sls linux ${EXCLUDE_IDS}"
+wait_for 3.0 "salt -C 'E@^(${NODE_MASK}).*' pkg.upgrade refresh=False dist_upgrade=True"
 
 salt -C "E@^(${NODE_MASK}).*" cmd.run 'reboot'
 wait_for 90.0 "salt -C 'E@^(${NODE_MASK}).*' test.ping"
-wait_for 3.0 "salt -C 'E@^(${NODE_MASK}).*' pkg.upgrade refresh=False dist_upgrade=True"
 wait_for 3.0 "salt -C 'E@^(${NODE_MASK}).*' state.apply salt,ntp"
diff --git a/mcp/patches/reclass-system-salt-model/0003-Define-keystone-domain-for-heat-stack.patch b/mcp/patches/reclass-system-salt-model/0003-Define-keystone-domain-for-heat-stack.patch
deleted file mode 100644
index 645c9bbdb..000000000
--- a/mcp/patches/reclass-system-salt-model/0003-Define-keystone-domain-for-heat-stack.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2019 Mirantis Inc., Enea AB and others.
-:
-: All rights reserved. This program and the accompanying materials
-: are made available under the terms of the Apache License, Version 2.0
-: which accompanies this distribution, and is available at
-: http://www.apache.org/licenses/LICENSE-2.0
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Michael Polenchuk <mpolenchuk@mirantis.com>
-Date: Wed, 9 Jan 2019 15:36:36 +0400
-Subject: [PATCH] Define keystone domain for heat stack
-
-Create domain for heat stack user by keystone state,
-previously it was doing by heat-keystone-setup-domain script.
-
-diff --git a/keystone/client/v3/service/heat.yml b/keystone/client/v3/service/heat.yml
-index 6c45bfe2..25d16e18 100644
---- a/keystone/client/v3/service/heat.yml
-+++ b/keystone/client/v3/service/heat.yml
-@@ -6,6 +6,9 @@ parameters:
-     client:
-       resources:
-         v3:
-+          domains:
-+            heat:
-+              description: 'Contains users and projects created by heat'
-           roles:
-             heat_stack_user:
-               name: heat_stack_user
-@@ -21,6 +24,15 @@ parameters:
-                 service_admin:
-                   name: admin
-                   project_id: service
-+            heat_domain_admin:
-+              domain_id: heat
-+              password: ${_param:heat_domain_admin_password}
-+              email: ${_param:admin_email}
-+              roles:
-+                heat_stack_admin:
-+                  name: admin
-+                  role_domain_id: heat
-+                  domain_id: heat
-           services:
-             heat:
-               type: orchestration
diff --git a/mcp/patches/salt-formula-aodh/0001-Extend-apache-service-state.patch b/mcp/patches/salt-formula-aodh/0001-Extend-apache-service-state.patch
new file mode 100644
index 000000000..9bf85efa0
--- /dev/null
+++ b/mcp/patches/salt-formula-aodh/0001-Extend-apache-service-state.patch
@@ -0,0 +1,47 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: Copyright (c) 2019 Mirantis Inc., Enea AB and others.
+:
+: All rights reserved. This program and the accompanying materials
+: are made available under the terms of the Apache License, Version 2.0
+: which accompanies this distribution, and is available at
+: http://www.apache.org/licenses/LICENSE-2.0
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+From: Michael Polenchuk <mpolenchuk@mirantis.com>
+Date: Wed, 10 Jul 2019 10:18:58 +0400
+Subject: [PATCH] Extend apache service state
+
+diff --git a/aodh/server.sls b/aodh/server.sls
+index 04b0395..258e5fe 100644
+--- a/aodh/server.sls
++++ b/aodh/server.sls
+@@ -183,20 +183,16 @@ aodh_api_config:
+ 
+ {%- endif %}
+ 
+-aodh_apache_restart:
+-  service.running:
+-  - enable: true
+-  - name: apache2
+-  {%- if grains.get('noservices') %}
+-  - onlyif: /bin/false
+-  {%- endif %}
+-  - watch:
+-    - file: /etc/aodh/aodh.conf
+-    {%- if pillar.get('apache', {}).get('server', {}).get('site', {}).aodh is defined %}
+-    - apache_enable_aodh_wsgi
+-    {%- else %}
+-    - file: aodh_api_apache_config
+-    {%- endif %}
++extend:
++  apache_service:
++    service.running:
++    - watch:
++      - file: /etc/aodh/aodh.conf
++      {%- if pillar.get('apache', {}).get('server', {}).get('site', {}).aodh is defined %}
++      - apache_enable_aodh_wsgi
++      {%- else %}
++      - file: aodh_api_apache_config
++      {%- endif %}
+ 
+ {%- endif %}
+ 
diff --git a/mcp/patches/salt-formula-cinder/0001-Support-rocky-version.patch b/mcp/patches/salt-formula-cinder/0001-Support-rocky-version.patch
deleted file mode 100644
index 39b146495..000000000
--- a/mcp/patches/salt-formula-cinder/0001-Support-rocky-version.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2018 Mirantis Inc., Enea AB and others.
-:
-: All rights reserved. This program and the accompanying materials
-: are made available under the terms of the Apache License, Version 2.0
-: which accompanies this distribution, and is available at
-: http://www.apache.org/licenses/LICENSE-2.0
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Michael Polenchuk <mpolenchuk@mirantis.com>
-Date: Thu, 29 Nov 2018 13:53:14 +0400
-Subject: [PATCH] Support rocky version
-
-Change-Id: I00450e0cdced03ea08ce22ac611b6baafc1c782e
-Related-Prod: PROD-23724
-
-diff --git a/cinder/controller.sls b/cinder/controller.sls
-index f103550..33e062f 100644
---- a/cinder/controller.sls
-+++ b/cinder/controller.sls
-@@ -58,7 +58,7 @@ cinder_controller_packages:
-   {%- set cinder_log_services = controller.services %}
- {%- endif %}
-
--{%- if controller.version not in ('ocata','pike','queens') %}
-+{%- if controller.version not in ('ocata', 'pike', 'queens', 'rocky') %}
-   {%- do cinder_log_services.append('cinder-api') %}
- {%- endif %}
-
-@@ -307,7 +307,7 @@ cinder_controller_services:
- {#- Therefore if api_version is not defined and OpenStack version is mitaka or newton use v2.0. #}
- {%- if 'api_version' in identity %}
- {%- set keystone_api_version = identity.get('api_version') %}
--{%- else %} 
-+{%- else %}
- {%- if 'version' in controller and controller.version in ['mitaka', 'newton'] %}
- {%- set keystone_api_version = 'v2.0' %}
- {%- else %}
-diff --git a/cinder/map.jinja b/cinder/map.jinja
-index 18050cf..01a967d 100644
---- a/cinder/map.jinja
-+++ b/cinder/map.jinja
-@@ -77,7 +77,7 @@
-     'BaseDefaults': default_params,
-     'Debian': {
-         'pkgs': ['cinder-volume', 'lvm2', 'sysfsutils', 'sg3-utils', 'python-cinder','python-mysqldb','p7zip', 'gettext-base', 'python-memcache', 'python-pycadf'],
--        'openiscsi_pkgs': ['open-iscsi', 'tgt'],
-+        'openiscsi_pkgs': ['open-iscsi', 'tgt', 'thin-provisioning-tools'],
-         'iscsitarget_pkgs': ['iscsitarget', 'iscsitarget-dkms'],
-         'services': ['cinder-volume'],
-         'iscsitarget_services': ['iscsitarget'],
diff --git a/mcp/patches/salt-formula-cinder/0001-Support-stein-version.patch b/mcp/patches/salt-formula-cinder/0001-Support-stein-version.patch
new file mode 100644
index 000000000..bae93ce6f
--- /dev/null
+++ b/mcp/patches/salt-formula-cinder/0001-Support-stein-version.patch
@@ -0,0 +1,25 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: Copyright (c) 2019 Mirantis Inc., Enea AB and others.
+:
+: All rights reserved. This program and the accompanying materials
+: are made available under the terms of the Apache License, Version 2.0
+: which accompanies this distribution, and is available at
+: http://www.apache.org/licenses/LICENSE-2.0
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+From: Michael Polenchuk <mpolenchuk@mirantis.com>
+Date: Tue, 9 Jul 2019 14:23:14 +0400
+Subject: [PATCH] Support stein version
+
+diff --git a/cinder/controller.sls b/cinder/controller.sls
+index 31cb53c..f58e261 100644
+--- a/cinder/controller.sls
++++ b/cinder/controller.sls
+@@ -72,7 +72,7 @@ cinder_controller_packages:
+ {%- endif %}
+ 
+ {# Starting from ocata api running undder apache, so dedicated loggong.conf is not needed #}
+-{%- if controller.version not in ('ocata','pike','queens', 'rocky') %}
++{%- if controller.version not in ('ocata','pike','queens', 'rocky', 'stein') %}
+   {%- do cinder_log_services.append('cinder-api') %}
+ {%- endif %}
+ 
diff --git a/mcp/patches/salt-formula-heat/0001-Support-rocky-version.patch b/mcp/patches/salt-formula-heat/0001-Support-rocky-version.patch
deleted file mode 100644
index 62fe935fe..000000000
--- a/mcp/patches/salt-formula-heat/0001-Support-rocky-version.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2018 Mirantis Inc., Enea AB and others.
-:
-: All rights reserved. This program and the accompanying materials
-: are made available under the terms of the Apache License, Version 2.0
-: which accompanies this distribution, and is available at
-: http://www.apache.org/licenses/LICENSE-2.0
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Michael Polenchuk <mpolenchuk@mirantis.com>
-Date: Wed, 28 Nov 2018 13:06:33 +0400
-Subject: [PATCH] Support rocky version
-
-Change-Id: I4116f8cf359f7a3187411577cfcafda115c7be59
-Related-Prod: PROD-23724
-
-diff --git a/heat/files/queens/heat.conf.Debian b/heat/files/queens/heat.conf.Debian
-index f5b4b13..6b90880 100644
---- a/heat/files/queens/heat.conf.Debian
-+++ b/heat/files/queens/heat.conf.Debian
-@@ -230,12 +230,12 @@ region_name_for_services = {{ server.region }}
-
- # Keystone domain name which contains heat template-defined users. If
- # `stack_user_domain_id` option is set, this option is ignored. (string value)
--stack_user_domain_name = {{ server.stack_domain_admin.get('stack_user_domain_name', 'heat_user_domain') }}
-+stack_user_domain_name = {{ server.stack_domain_admin.get('domain', 'heat_user_domain') }}
-
- # Keystone username, a user with roles sufficient to manage users and projects
- # in the stack_user_domain. (string value)
- #stack_domain_admin = <None>
--stack_domain_admin = heat_domain_admin
-+stack_domain_admin = {{ server.stack_domain_admin.get('name', 'heat_domain_admin') }}
-
- # Keystone password for stack_domain_admin user. (string value)
- #stack_domain_admin_password = <None>
-@@ -257,7 +257,7 @@ stack_domain_admin_password = {{ server.stack_domain_admin.password }}
- {%- endif %}
-
- # Maximum raw byte size of any template. (integer value)
--max_template_size = {{ server.get('max_template_size', 5440000) }} 
-+max_template_size = {{ server.get('max_template_size', 5440000) }}
-
- # Maximum depth allowed when using nested stacks. (integer value)
- #max_nested_stack_depth = 5
-diff --git a/heat/server.sls b/heat/server.sls
-index 02e73b4..037c28a 100644
---- a/heat/server.sls
-+++ b/heat/server.sls
-@@ -156,11 +156,16 @@ keystonercv3:
- {%- endif %}
-
- {%- if not grains.get('virtual_subtype', None) == "Docker" %}
--{%- if server.version != 'juno' %}
-+{%- if server.version not in ['juno', 'rocky'] %}
-
- heat_keystone_setup:
-   cmd.run:
--  - name: 'source /root/keystonercv3; heat-keystone-setup-domain --stack-user-domain-name heat_user_domain --stack-domain-admin heat_domain_admin --stack-domain-admin-password {{ server.stack_domain_admin.password }}'
-+  - name: >-
-+      source /root/keystonercv3;
-+      heat-keystone-setup-domain
-+      --stack-user-domain-name {{ server.stack_domain_admin.domain|default('heat_user_domain') }}
-+      --stack-domain-admin {{ server.stack_domain_admin.name|default('heat_domain_admin') }}
-+      --stack-domain-admin-password {{ server.stack_domain_admin.password }}
-   - shell: /bin/bash
-   - require:
-     - file: /etc/heat/heat.conf
diff --git a/mcp/patches/salt-formula-horizon/0001-Support-rocky-version.patch b/mcp/patches/salt-formula-horizon/0001-Support-stein-version.patch
index aff7dfcf0..8c9aab91b 100644
--- a/mcp/patches/salt-formula-horizon/0001-Support-rocky-version.patch
+++ b/mcp/patches/salt-formula-horizon/0001-Support-stein-version.patch
@@ -1,5 +1,5 @@
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2018 Mirantis Inc., Enea AB and others.
+: Copyright (c) 2019 Mirantis Inc., Enea AB and others.
 :
 : All rights reserved. This program and the accompanying materials
 : are made available under the terms of the Apache License, Version 2.0
@@ -7,24 +7,22 @@
 : http://www.apache.org/licenses/LICENSE-2.0
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Thu, 20 Dec 2018 16:35:02 +0100
-Subject: [PATCH] Support rocky version
+Date: Tue, 9 Jul 2019 14:54:50 +0400
+Subject: [PATCH] Support stein version
 
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-
-diff --git a/horizon/files/local_settings/rocky_settings.py b/horizon/files/local_settings/rocky_settings.py
+diff --git a/horizon/files/local_settings/stein_settings.py b/horizon/files/local_settings/stein_settings.py
 new file mode 120000
-index 0000000..30ad409
+index 0000000..183e9a8
 --- /dev/null
-+++ b/horizon/files/local_settings/rocky_settings.py
++++ b/horizon/files/local_settings/stein_settings.py
 @@ -0,0 +1 @@
-+queens_settings.py
++rocky_settings.py
 \ No newline at end of file
-diff --git a/horizon/files/policy/rocky b/horizon/files/policy/rocky
+diff --git a/horizon/files/policy/stein b/horizon/files/policy/stein
 new file mode 120000
-index 0000000..06aba54
+index 0000000..c8dbb8c
 --- /dev/null
-+++ b/horizon/files/policy/rocky
++++ b/horizon/files/policy/stein
 @@ -0,0 +1 @@
-+queens/
++rocky
 \ No newline at end of file
diff --git a/mcp/patches/salt-formula-keystone/0002-Get-domain-id-instead-of-name.patch b/mcp/patches/salt-formula-keystone/0002-Get-domain-id-instead-of-name.patch
deleted file mode 100644
index ba7450260..000000000
--- a/mcp/patches/salt-formula-keystone/0002-Get-domain-id-instead-of-name.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2019 Mirantis Inc., Enea AB and others.
-:
-: All rights reserved. This program and the accompanying materials
-: are made available under the terms of the Apache License, Version 2.0
-: which accompanies this distribution, and is available at
-: http://www.apache.org/licenses/LICENSE-2.0
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Michael Polenchuk <mpolenchuk@mirantis.com>
-Date: Tue, 22 Jan 2019 12:43:12 +0400
-Subject: [PATCH] Get domain id instead of name for user_create
-
-diff --git a/_states/keystonev3.py b/_states/keystonev3.py
-index 2dd651d..46aed30 100644
---- a/_states/keystonev3.py
-+++ b/_states/keystonev3.py
-@@ -237,6 +237,11 @@ def user_present(name, cloud_name, password_reset=False, **kwargs):
-              'project_get_details', kwargs['default_project_id'],
-              cloud_name=cloud_name)['project']['id']
-
-+    if 'domain_id' in kwargs:
-+        kwargs['domain_id'] = _keystonev3_call(
-+             'domain_get_details', kwargs['domain_id'],
-+             cloud_name=cloud_name)['domain']['id']
-+
-     if not users:
-         try:
-             resp = _keystonev3_call(
diff --git a/mcp/patches/salt-formula-neutron/0001-Bring-in-basic-VPP-support.patch b/mcp/patches/salt-formula-neutron/0001-Bring-in-basic-VPP-support.patch
index 14c5e8109..87f79f742 100644
--- a/mcp/patches/salt-formula-neutron/0001-Bring-in-basic-VPP-support.patch
+++ b/mcp/patches/salt-formula-neutron/0001-Bring-in-basic-VPP-support.patch
@@ -14,16 +14,6 @@ TODO:
 - update README
 
 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- neutron/agents/_vpp.sls               | 25 ++++++++++++++++
- neutron/compute.sls                   |  2 ++
- neutron/files/rocky/_ml2_conf.vpp.ini | 41 +++++++++++++++++++++++++++
- neutron/files/rocky/ml2_conf.ini      |  4 +++
- neutron/gateway.sls                   |  2 ++
- neutron/map.jinja                     | 16 +++++++++++
- 6 files changed, 90 insertions(+)
- create mode 100644 neutron/agents/_vpp.sls
- create mode 100644 neutron/files/rocky/_ml2_conf.vpp.ini
 
 diff --git a/neutron/agents/_vpp.sls b/neutron/agents/_vpp.sls
 new file mode 100644
@@ -68,7 +58,7 @@ index 708a51d..3767011 100644
        {%- include "neutron/ml2_ovs/init.sls" %}
 +      {%- include "neutron/agents/_vpp.sls" %}
      {%- endif %}
-
+ 
    {%- elif compute.backend.engine == "ovn" %}
 diff --git a/neutron/files/rocky/_ml2_conf.vpp.ini b/neutron/files/rocky/_ml2_conf.vpp.ini
 new file mode 100644
@@ -118,7 +108,7 @@ index 0000000..2373f64
 +
 +{%- endif %}
 diff --git a/neutron/files/rocky/ml2_conf.ini b/neutron/files/rocky/ml2_conf.ini
-index 48ad7df..4f323fa 100644
+index a9a598f..4429c80 100644
 --- a/neutron/files/rocky/ml2_conf.ini
 +++ b/neutron/files/rocky/ml2_conf.ini
 @@ -27,6 +27,9 @@ agent_boot_time = {{ server.get('agent_boot_time', 180) }}
@@ -128,32 +118,32 @@ index 48ad7df..4f323fa 100644
 +{%- if 'vpp' in server.backend.get('mechanism', []) %}
 +type_drivers = flat,vlan
 +{%- endif %}
-
+ 
  # Ordered list of network_types to allocate as tenant networks. The default
  # value 'local' is useful for single-box testing but provides no connectivity
 @@ -239,6 +242,7 @@ neutron_sync_mode = {{ _ovn.neutron_sync_mode|default('repair') }}
  enable_distributed_floating_ip = {{ server.dvr|default('false') }}
  {%- endif %}
-
+ 
 +{%- include "neutron/files/rocky/_ml2_conf.vpp.ini" %}
-
+ 
  {%- if server.backend.opendaylight|default(False) %}
  [ml2_odl]
 diff --git a/neutron/gateway.sls b/neutron/gateway.sls
-index 61b4372..ca07b9f 100644
+index e51990a..95d4d07 100644
 --- a/neutron/gateway.sls
 +++ b/neutron/gateway.sls
 @@ -40,6 +40,8 @@ haproxy:
-
+ 
  {%- endif %}
-
+ 
 +{%- include "neutron/agents/_vpp.sls" %}
 +
  {%- if gateway.l2gw is defined %}
  {%- include "neutron/agents/_l2gw.sls" %}
  {%- endif %}
 diff --git a/neutron/map.jinja b/neutron/map.jinja
-index 1670a3f..3a03952 100644
+index 9e6cb36..17cd5b3 100644
 --- a/neutron/map.jinja
 +++ b/neutron/map.jinja
 @@ -14,9 +14,13 @@
@@ -170,13 +160,15 @@ index 1670a3f..3a03952 100644
  {%- else %}
  {%- set pkgs_cmp = ['neutron-openvswitch-agent', 'python-pycadf'] %}
  {%- set services_cmp = ['neutron-openvswitch-agent'] %}
-@@ -72,11 +76,19 @@
-
+@@ -73,6 +77,7 @@
  {%- set opendaylight_enabled = pillar.neutron.gateway is defined and pillar.neutron.gateway.opendaylight is defined %}
  {%- set linuxbridge_enabled = pillar.neutron.gateway is defined and pillar.neutron.gateway.get('backend', {}).get('mechanism', {}).get('lb', {}).get('driver', {}) == "linuxbridge" %}
+ {%- set dhcp_enabled = pillar.neutron.gateway is defined and pillar.neutron.gateway.get('dhcp_agent_enabled', True) %}
 +{%- set vpp_enabled = 'vpp' in pillar.neutron.get('gateway', {}).get('backend', {}).get('mechanism', []) %}
- {%- set pkgs_list = ['neutron-dhcp-agent', 'neutron-metadata-agent'] %}
- {%- set services_list = ['neutron-metadata-agent', 'neutron-dhcp-agent'] %}
+ {%- set pkgs_list = ['neutron-metadata-agent'] %}
+ 
+ {%- set services_list = ['neutron-metadata-agent'] %}
+@@ -83,6 +88,13 @@
  {%- if linuxbridge_enabled %}
  {%- do pkgs_list.extend(['neutron-linuxbridge-agent', 'neutron-l3-agent']) %}
  {%- do services_list.extend(['neutron-linuxbridge-agent', 'neutron-l3-agent']) %}
@@ -190,10 +182,10 @@ index 1670a3f..3a03952 100644
  {%- elif not opendaylight_enabled %}
  {%- do pkgs_list.extend(['neutron-openvswitch-agent', 'neutron-l3-agent']) %}
  {%- do services_list.extend(['neutron-openvswitch-agent', 'neutron-l3-agent']) %}
-@@ -124,6 +136,10 @@
- {%- do server_pkgs_list.append('python-networking-sfc') %}
- {%- endif %}
-
+@@ -132,6 +144,10 @@
+ {%- set server_services_list = ['neutron-server'] %}
+ {%- do server_services_list.append('neutron-rpc-server') if wsgi_enabled %}
+ 
 +{%- if 'vpp' in pillar.neutron.get('server', {}).get('backend', {}).get('mechanism', []) %}
 +{%- do server_pkgs_list.extend(['python-networking-vpp']) %}
 +{%- endif %}
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}
diff --git a/mcp/reclass/nodes/cfg01.mcp-fdio-noha.local.yml b/mcp/reclass/nodes/cfg01.mcp-fdio-noha.local.yml
index 9a7ac1476..29bd93de7 100644
--- a/mcp/reclass/nodes/cfg01.mcp-fdio-noha.local.yml
+++ b/mcp/reclass/nodes/cfg01.mcp-fdio-noha.local.yml
@@ -10,7 +10,7 @@ classes:
   - cluster.mcp-fdio-noha.infra.config
 parameters:
   _param:
-    linux_system_codename: xenial
+    linux_system_codename: bionic
     reclass_data_revision: master
   linux:
     system:
diff --git a/mcp/reclass/nodes/cfg01.mcp-iec-noha.local.yml b/mcp/reclass/nodes/cfg01.mcp-iec-noha.local.yml
index 0196ca51f..82f7b155e 100644
--- a/mcp/reclass/nodes/cfg01.mcp-iec-noha.local.yml
+++ b/mcp/reclass/nodes/cfg01.mcp-iec-noha.local.yml
@@ -10,7 +10,7 @@ classes:
   - cluster.mcp-iec-noha.infra.config
 parameters:
   _param:
-    linux_system_codename: xenial
+    linux_system_codename: bionic
     reclass_data_revision: master
   linux:
     system:
diff --git a/mcp/reclass/nodes/cfg01.mcp-k8s-calico-noha.local.yml b/mcp/reclass/nodes/cfg01.mcp-k8s-calico-noha.local.yml
index 1e9d99073..cd2fd1a57 100644
--- a/mcp/reclass/nodes/cfg01.mcp-k8s-calico-noha.local.yml
+++ b/mcp/reclass/nodes/cfg01.mcp-k8s-calico-noha.local.yml
@@ -10,7 +10,7 @@ classes:
   - cluster.mcp-k8s-calico-noha.infra.config
 parameters:
   _param:
-    linux_system_codename: xenial
+    linux_system_codename: bionic
     reclass_data_revision: master
   linux:
     system:
diff --git a/mcp/reclass/nodes/cfg01.mcp-odl-noha.local.yml b/mcp/reclass/nodes/cfg01.mcp-odl-noha.local.yml
index 4fd327242..fcad8a6cf 100644
--- a/mcp/reclass/nodes/cfg01.mcp-odl-noha.local.yml
+++ b/mcp/reclass/nodes/cfg01.mcp-odl-noha.local.yml
@@ -10,7 +10,7 @@ classes:
   - cluster.mcp-odl-noha.infra.config
 parameters:
   _param:
-    linux_system_codename: xenial
+    linux_system_codename: bionic
     reclass_data_revision: master
   linux:
     system:
diff --git a/mcp/reclass/nodes/cfg01.mcp-ovn-noha.local.yml b/mcp/reclass/nodes/cfg01.mcp-ovn-noha.local.yml
index 6ae0367b9..22014d7a2 100644
--- a/mcp/reclass/nodes/cfg01.mcp-ovn-noha.local.yml
+++ b/mcp/reclass/nodes/cfg01.mcp-ovn-noha.local.yml
@@ -10,7 +10,7 @@ classes:
   - cluster.mcp-ovn-noha.infra.config
 parameters:
   _param:
-    linux_system_codename: xenial
+    linux_system_codename: bionic
     reclass_data_revision: master
   linux:
     system:
diff --git a/mcp/reclass/nodes/cfg01.mcp-ovs-dpdk-noha.local.yml b/mcp/reclass/nodes/cfg01.mcp-ovs-dpdk-noha.local.yml
index 30b61848e..d1ba70a91 100644
--- a/mcp/reclass/nodes/cfg01.mcp-ovs-dpdk-noha.local.yml
+++ b/mcp/reclass/nodes/cfg01.mcp-ovs-dpdk-noha.local.yml
@@ -10,7 +10,7 @@ classes:
   - cluster.mcp-ovs-dpdk-noha.infra.config
 parameters:
   _param:
-    linux_system_codename: xenial
+    linux_system_codename: bionic
     reclass_data_revision: master
   linux:
     system:
diff --git a/mcp/reclass/nodes/cfg01.mcp-ovs-noha.local.yml b/mcp/reclass/nodes/cfg01.mcp-ovs-noha.local.yml
index 658061b26..9d1f0265a 100644
--- a/mcp/reclass/nodes/cfg01.mcp-ovs-noha.local.yml
+++ b/mcp/reclass/nodes/cfg01.mcp-ovs-noha.local.yml
@@ -10,7 +10,7 @@ classes:
   - cluster.mcp-ovs-noha.infra.config
 parameters:
   _param:
-    linux_system_codename: xenial
+    linux_system_codename: bionic
     reclass_data_revision: master
   linux:
     system:
diff --git a/mcp/salt-formulas/salt-formula-aodh b/mcp/salt-formulas/salt-formula-aodh
new file mode 160000
+Subproject 858785a84cdbfb3add01158d40237af0d41e4b4
diff --git a/mcp/salt-formulas/salt-formula-barbican b/mcp/salt-formulas/salt-formula-barbican
new file mode 160000
+Subproject f70167cf8e99bdd72bcac7dbc946ec1655d5f31
diff --git a/mcp/salt-formulas/salt-formula-ceilometer b/mcp/salt-formulas/salt-formula-ceilometer
new file mode 160000
+Subproject 7478c662b0a41671ebb76af936948d29e1a0448
diff --git a/mcp/salt-formulas/salt-formula-cinder b/mcp/salt-formulas/salt-formula-cinder
-Subproject 8dad216af1b86a3297f6d1a7b4dd1abe5586fdb
+Subproject 57837bfba6427fd0d63afae332c724be5c3fa3b
diff --git a/mcp/salt-formulas/salt-formula-glance b/mcp/salt-formulas/salt-formula-glance
new file mode 160000
+Subproject bab584dc63874210c1bd3e42bcca8fd06d06ed3
diff --git a/mcp/salt-formulas/salt-formula-gnocchi b/mcp/salt-formulas/salt-formula-gnocchi
-Subproject 52049de243bc473b9c905d1948d9c5d11739be3
+Subproject 0d4773a7dc87872dd28b3be0fc8a0a81cdaa864
diff --git a/mcp/salt-formulas/salt-formula-heat b/mcp/salt-formulas/salt-formula-heat
-Subproject f27b09d94f677fc3df2e55c28a3cd5711c32476
+Subproject f1218e910d9bbf38c48b67e27cfa3c83024bbae
diff --git a/mcp/salt-formulas/salt-formula-horizon b/mcp/salt-formulas/salt-formula-horizon
-Subproject 79f291a971dafeaad5adf27d3c4ba7559e19183
+Subproject 116b93154b33bea17251b118e84c3eb47eb6893
diff --git a/mcp/salt-formulas/salt-formula-keystone b/mcp/salt-formulas/salt-formula-keystone
-Subproject 8814da19ad8d62d2789f2a90251c9cbcdb00529
+Subproject 196016fcaeb572108221933051b67568a52e80b
diff --git a/mcp/salt-formulas/salt-formula-neutron b/mcp/salt-formulas/salt-formula-neutron
-Subproject ff64d9c8db6dc60c9c95c940df36a1f536951de
+Subproject 7e623c0c660715f58ceaaf20e3d8620454c3977
diff --git a/mcp/salt-formulas/salt-formula-nova b/mcp/salt-formulas/salt-formula-nova
-Subproject 52585ec28bd1e64660cf6897fb33a9dfd8214a8
+Subproject 60df8720a81b32f05885e3cbd49a4bb6e8960e2
diff --git a/mcp/salt-formulas/salt-formula-oslo-templates b/mcp/salt-formulas/salt-formula-oslo-templates
-Subproject 779d20aebfc5ed1fe1db645fd71a6456ed3550c
+Subproject 3534ca9dd05031cbde84cc878122183e3b6daec
diff --git a/mcp/salt-formulas/salt-formula-panko b/mcp/salt-formulas/salt-formula-panko
new file mode 160000
+Subproject 31c752a6eedf41bf4310f7a620acd87b61d0f09
diff --git a/mcp/scripts/docker-compose/files/entrypoint.sh b/mcp/scripts/docker-compose/files/entrypoint.sh
index b50dd2761..4ad1c154f 100755
--- a/mcp/scripts/docker-compose/files/entrypoint.sh
+++ b/mcp/scripts/docker-compose/files/entrypoint.sh
@@ -67,10 +67,10 @@ for formula in /usr/share/salt-formulas/reclass/service/*; do
     ln -sf "${formula}" "/srv/salt/reclass/classes/service/$(basename ${formula})"
 done
 
-# Temporary link queens configs to rocky
-for f in /srv/salt/env/prd/*/files/queens; do
-    if [ ! -d "$f/../rocky" ]; then
-        ln -sf "$f" "$f/../rocky"
+# Temporary link rocky configs to stein
+for f in /srv/salt/env/prd/*/files/rocky; do
+    if [ ! -d "$f/../stein" ]; then
+        ln -sf "$f" "$f/../stein"
     fi
 done