summaryrefslogtreecommitdiffstats
path: root/mcp/reclass
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2019-07-11 16:02:25 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2019-07-12 13:12:40 +0400
commit7e909a3de0898448ee43c56efb264c74aa0feac6 (patch)
tree6d0d61a6826ec4fc666684eb8bdc11270182f610 /mcp/reclass
parent2ed3a56ae4865514ba099773616df96865a0ca32 (diff)
Align python3 packages with stein requirements
Change-Id: Ib2b1525957929c39e4b602ad1b7f4fbfd16a375c Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/reclass')
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-arch-common/backports.yml2
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j28
2 files changed, 3 insertions, 7 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 4bf8ab3fb..e2de54dc8 100644
--- a/mcp/reclass/classes/cluster/all-mcp-arch-common/backports.yml
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/backports.yml
@@ -34,7 +34,7 @@ parameters:
package: 'mysql-common'
20:
enabled: true
- pin: 'release o=Mirantis'
+ pin: 'release o=Mirantis,l=openstack-rocky-nightly'
priority: 1
mirantis_extra:
# yamllint disable-line rule:line-length
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 504ee087e..3d9dcf5f9 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
@@ -85,10 +85,8 @@ parameters:
volume_device_name: sdc
pkgs:
- keystone
- - python-psycopg2
- - python-mysqldb
- - python-openstackclient
- - python-tornado
+ - python3-memcache
+ - python3-openstackclient
client:
enabled: true
resources:
@@ -210,8 +208,6 @@ 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