1 files changed, 24 insertions, 24 deletions

diff --git a/meta-openstack/recipes-support/salt/salt_2018.3.0.bb b/meta-openstack/recipes-support/salt/salt_2018.3.0.bb
index a4022be..fb75872 100644
--- a/meta-openstack/recipes-support/salt/salt_2018.3.0.bb
+++ b/meta-openstack/recipes-support/salt/salt_2018.3.0.bb
@@ -3,15 +3,15 @@ SECTION = "admin"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=fb92f464675f6b5df90f540d60237915"
 DEPENDS = "\
-           python-msgpack \
-           python-pyyaml \
-           python-jinja2 \
-           python-markupsafe \
+           python3-msgpack \
+           python3-pyyaml \
+           python3-jinja2 \
+           python3-markupsafe \
 "
 
 PACKAGECONFIG ??= "zeromq"
-PACKAGECONFIG[zeromq] = ",,python-pyzmq python-pycrypto,"
-PACKAGECONFIG[tcp] = ",,python-pycrypto"
+PACKAGECONFIG[zeromq] = ",,python3-pyzmq python3-pycrypto,"
+PACKAGECONFIG[tcp] = ",,python3-pycrypto"
 
 SRC_URI = "https://files.pythonhosted.org/packages/source/s/${PN}/${PN}-${PV}.tar.gz \
            file://set_python_location_hashbang.patch \
@@ -32,7 +32,7 @@ SRC_URI[sha256sum] = "a0a45d22fdf6961542a419b7e09568a3118e2b019ffe7bab9dee5aeb55
 
 S = "${WORKDIR}/${PN}-${PV}"
 
-inherit setuptools update-rc.d
+inherit setuptools3 update-rc.d
 
 # Avoid a QA Warning triggered by the test package including a file
 # with a .a extension
@@ -88,11 +88,11 @@ Between the remote execution system, and state management Salt addresses the bac
 
 SUMMARY_${PN}-minion = "client package for salt, the distributed remote execution system"
 DESCRIPTION_${PN}-minion = "${DESCRIPTION_COMMON} This particular package provides the worker agent for salt."
-RDEPENDS_${PN}-minion = "${PN}-common (= ${EXTENDPKGV}) python-msgpack"
-RDEPENDS_${PN}-minion += "${@bb.utils.contains('PACKAGECONFIG', 'zeromq', 'python-pycrypto python-pyzmq (>= 13.1.0)', '',d)}"
-RDEPENDS_${PN}-minion += "${@bb.utils.contains('PACKAGECONFIG', 'tcp', 'python-pycrypto', '',d)}"
+RDEPENDS_${PN}-minion = "${PN}-common (= ${EXTENDPKGV}) python3-msgpack"
+RDEPENDS_${PN}-minion += "${@bb.utils.contains('PACKAGECONFIG', 'zeromq', 'python3-pycrypto python3-pyzmq (>= 13.1.0)', '',d)}"
+RDEPENDS_${PN}-minion += "${@bb.utils.contains('PACKAGECONFIG', 'tcp', 'python3-pycrypto', '',d)}"
 RRECOMMENDS_${PN}-minion_append_x64 = "dmidecode"
-RSUGGESTS_${PN}-minion = "python-augeas"
+RSUGGESTS_${PN}-minion = "python3-augeas"
 CONFFILES_${PN}-minion = "${sysconfdir}/${PN}/minion ${sysconfdir}/init.d/${PN}-minion"
 FILES_${PN}-minion = "${bindir}/${PN}-minion ${sysconfdir}/${PN}/minion.d/ ${CONFFILES_${PN}-minion} ${bindir}/${PN}-proxy"
 INITSCRIPT_NAME_${PN}-minion = "${PN}-minion"
@@ -101,18 +101,18 @@ INITSCRIPT_PARAMS_${PN}-minion = "defaults"
 SUMMARY_${PN}-common = "shared libraries that salt requires for all packages"
 DESCRIPTION_${PN}-common ="${DESCRIPTION_COMMON} This particular package provides shared libraries that \
 salt-master, salt-minion, and salt-syndic require to function."
-RDEPENDS_${PN}-common = "python-dateutil python-jinja2 python-pyyaml python-requests (>= 1.0.0) python-tornado (>= 4.2.1)"
-RRECOMMENDS_${PN}-common = "lsb python-futures"
-RSUGGESTS_${PN}-common = "python-mako python-git"
-RCONFLICTS_${PN}-common = "python-mako (< 0.7.0)"
+RDEPENDS_${PN}-common = "python3-dateutil python3-jinja2 python3-pyyaml python3-requests (>= 1.0.0) python3-tornado (>= 4.2.1)"
+RRECOMMENDS_${PN}-common = "lsb python3-futures"
+RSUGGESTS_${PN}-common = "python3-mako python3-git"
+RCONFLICTS_${PN}-common = "python3-mako (< 0.7.0)"
 CONFFILES_${PN}-common="${sysconfdir}/logrotate.d/${PN}-common"
-FILES_${PN}-common = "${bindir}/${PN}-call ${libdir}/python2.7/ ${CONFFILES_${PN}-common}"
+FILES_${PN}-common = "${bindir}/${PN}-call ${libdir}/python${PYTHON_BASEVERSION}/ ${CONFFILES_${PN}-common}"
 
 SUMMARY_${PN}-ssh = "remote manager to administer servers via salt"
 DESCRIPTION_${PN}-ssh = "${DESCRIPTION_COMMON} This particular package provides the salt ssh controller. It \
 is able to run salt modules and states on remote hosts via ssh. No minion or other salt specific software needs\
  to be installed on the remote host."
-RDEPENDS_${PN}-ssh = "${PN}-common (= ${EXTENDPKGV}) python-msgpack"
+RDEPENDS_${PN}-ssh = "${PN}-common (= ${EXTENDPKGV}) python3-msgpack"
 CONFFILES_${PN}-ssh="${sysconfdir}/${PN}/roster"
 FILES_${PN}-ssh = "${bindir}/${PN}-ssh ${CONFFILES_${PN}-ssh}"
 
@@ -123,7 +123,7 @@ even a Websocket API. The Salt API system is used to expose the fundamental aspe
  sources. salt-api acts as the bridge between Salt itself and REST, Websockets, etc. Documentation is available\
  on Read the Docs: http://salt-api.readthedocs.org/"
 RDEPENDS_${PN}-api = "${PN}-master"
-RSUGGESTS_${PN}-api = "python-cherrypy"
+RSUGGESTS_${PN}-api = "python3-cherrypy"
 CONFFILES_${PN}-api = "${sysconfdir}/init.d/${PN}-api"
 FILES_${PN}-api = "${bindir}/${PN}-api ${CONFFILES_${PN}-api}"
 INITSCRIPT_NAME_${PN}-api = "${PN}-api"
@@ -131,11 +131,11 @@ INITSCRIPT_PARAMS_${PN}-api = "defaults"
 
 SUMMARY_${PN}-master = "remote manager to administer servers via salt"
 DESCRIPTION_${PN}-master ="${DESCRIPTION_COMMON} This particular package provides the salt controller."
-RDEPENDS_${PN}-master = "${PN}-common (= ${EXTENDPKGV}) python-msgpack"
-RDEPENDS_${PN}-master += "${@bb.utils.contains('PACKAGECONFIG', 'zeromq', 'python-pycrypto python-pyzmq (>= 13.1.0)', '',d)}"
-RDEPENDS_${PN}-master += "${@bb.utils.contains('PACKAGECONFIG', 'tcp', 'python-pycrypto', '',d)}"
+RDEPENDS_${PN}-master = "${PN}-common (= ${EXTENDPKGV}) python3-msgpack"
+RDEPENDS_${PN}-master += "${@bb.utils.contains('PACKAGECONFIG', 'zeromq', 'python3-pycrypto python3-pyzmq (>= 13.1.0)', '',d)}"
+RDEPENDS_${PN}-master += "${@bb.utils.contains('PACKAGECONFIG', 'tcp', 'python3-pycrypto', '',d)}"
 CONFFILES_${PN}-master="${sysconfdir}/init.d/${PN}-master  ${sysconfdir}/${PN}/master"
-RSUGGESTS_${PN}-master = "python-git"
+RSUGGESTS_${PN}-master = "python3-git"
 FILES_${PN}-master = "${bindir}/${PN} ${bindir}/${PN}-cp ${bindir}/${PN}-key ${bindir}/${PN}-master ${bindir}/${PN}-run ${bindir}/${PN}-unity ${bindir}/spm ${CONFFILES_${PN}-master}"
 INITSCRIPT_NAME_${PN}-master = "${PN}-master"
 INITSCRIPT_PARAMS_${PN}-master = "defaults"
@@ -152,13 +152,13 @@ INITSCRIPT_PARAMS_${PN}-syndic = "defaults"
 SUMMARY_${PN}-cloud = "public cloud VM management system"
 DESCRIPTION_${PN}-cloud = "provision virtual machines on various public clouds via a cleanly controlled profile and mapping system."
 RDEPENDS_${PN}-cloud = "${PN}-common (= ${EXTENDPKGV})"
-RSUGGESTS_${PN}-cloud = "python-netaddr python-botocore"
+RSUGGESTS_${PN}-cloud = "python3-netaddr python3-botocore"
 CONFFILES_${PN}-cloud = "${sysconfdir}/${PN}/cloud"
 FILES_${PN}-cloud = "${bindir}/${PN}-cloud ${sysconfdir}/${PN}/cloud.conf.d/ ${sysconfdir}/${PN}/cloud.profiles.d/ ${sysconfdir}/${PN}/cloud.providers.d/ ${CONFFILES_${PN}-cloud}"
 
 SUMMARY_${PN}-tests = "salt stack test suite"
 DESCRIPTION_${PN}-tests ="${DESCRIPTION_COMMON} This particular package provides the salt unit test suite."
-RDEPENDS_${PN}-tests = "${PN}-common python-pytest-salt python-tests python-image bash"
+RDEPENDS_${PN}-tests = "${PN}-common python3-pytest-salt python3-tests python3-image bash"
 FILES_${PN}-tests = "${PYTHON_SITEPACKAGES_DIR}/salt-tests/tests/"
 
 FILES_${PN}-bash-completion = "${sysconfdir}/bash_completion.d/${PN}-common"