From 7e909a3de0898448ee43c56efb264c74aa0feac6 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Thu, 11 Jul 2019 16:02:25 +0400 Subject: Align python3 packages with stein requirements Change-Id: Ib2b1525957929c39e4b602ad1b7f4fbfd16a375c Signed-off-by: Michael Polenchuk --- mcp/reclass/classes/cluster/all-mcp-arch-common/backports.yml | 2 +- .../classes/cluster/mcp-common-noha/openstack_control.yml.j2 | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) (limited to 'mcp/reclass/classes/cluster') 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 -- cgit 1.2.3-korg