From a15b423499cdbb16fff8b79f7bae2cadc53ccebc Mon Sep 17 00:00:00 2001 From: Sergey Kizunov Date: Mon, 20 Aug 2018 19:00:23 +0300 Subject: salt: bump 2016.11 -> 2018.3 Signed-off-by: Ioan-Adrian Ratiu Signed-off-by: Bruce Ashfield --- .../recipes-support/salt/salt_2016.11.0.bb | 165 --------------------- .../recipes-support/salt/salt_2018.3.0.bb | 164 ++++++++++++++++++++ 2 files changed, 164 insertions(+), 165 deletions(-) delete mode 100644 meta-openstack/recipes-support/salt/salt_2016.11.0.bb create mode 100644 meta-openstack/recipes-support/salt/salt_2018.3.0.bb diff --git a/meta-openstack/recipes-support/salt/salt_2016.11.0.bb b/meta-openstack/recipes-support/salt/salt_2016.11.0.bb deleted file mode 100644 index ba1def7..0000000 --- a/meta-openstack/recipes-support/salt/salt_2016.11.0.bb +++ /dev/null @@ -1,165 +0,0 @@ -HOMEPAGE = "http://saltstack.com/" -SECTION = "admin" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=fb92f464675f6b5df90f540d60237915" -DEPENDS = "\ - python-msgpack \ - python-pyyaml \ - python-jinja2 \ - python-markupsafe \ -" - -PACKAGECONFIG ??= "zeromq" -PACKAGECONFIG[zeromq] = ",,python-pyzmq python-pycrypto," -PACKAGECONFIG[tcp] = ",,python-pycrypto" - -SRCNAME = "salt" -SRC_URI = "https://files.pythonhosted.org/packages/source/s/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \ - file://set_python_location_hashbang.patch \ - file://minion \ - file://salt-minion \ - file://salt-common.bash_completion \ - file://salt-common.logrotate \ - file://salt-api \ - file://salt-master \ - file://master \ - file://salt-syndic \ - file://cloud \ - file://roster \ -" - -SRC_URI[md5sum] = "eced07a652cc6a31870fc098d5325a9c" -SRC_URI[sha256sum] = "b516285926ee95cedc64ecddab05d14422b7c8819c9f6d046a431c41d608e6bc" - -S = "${WORKDIR}/${SRCNAME}-${PV}" - -inherit setuptools update-rc.d - -# Avoid a QA Warning triggered by the test package including a file -# with a .a extension -INSANE_SKIP_${PN}-tests += "staticdev" - -# Note ${PN}-tests must be before ${PN}-common in the PACKAGES variable -# in order for ${PN}-tests to own the correct FILES. -PACKAGES += "\ - ${PN}-tests \ - ${PN}-api \ - ${PN}-cloud \ - ${PN}-common \ - ${PN}-master \ - ${PN}-minion \ - ${PN}-ssh \ - ${PN}-syndic \ - ${PN}-bash-completion \ -" - -do_install_append() { - install -d ${D}${sysconfdir}/bash_completion.d/ - install -m 0644 ${WORKDIR}/salt-common.bash_completion ${D}${sysconfdir}/bash_completion.d/${PN}-common - install -d ${D}${sysconfdir}/logrotate.d/ - install -m 0644 ${WORKDIR}/salt-common.logrotate ${D}${sysconfdir}/logrotate.d/${PN}-common - install -d ${D}${sysconfdir}/init.d/ - install -m 0755 ${WORKDIR}/salt-minion ${D}${sysconfdir}/init.d/${PN}-minion - install -m 0755 ${WORKDIR}/salt-api ${D}${sysconfdir}/init.d/${PN}-api - install -m 0755 ${WORKDIR}/salt-master ${D}${sysconfdir}/init.d/${PN}-master - install -m 0755 ${WORKDIR}/salt-syndic ${D}${sysconfdir}/init.d/${PN}-syndic - install -d ${D}${sysconfdir}/${PN}/ - install -m 0644 ${WORKDIR}/minion ${D}${sysconfdir}/${PN}/minion - install -m 0644 ${WORKDIR}/master ${D}${sysconfdir}/${PN}/master - install -m 0644 ${WORKDIR}/cloud ${D}${sysconfdir}/${PN}/cloud - install -m 0644 ${WORKDIR}/roster ${D}${sysconfdir}/${PN}/roster - install -d ${D}${sysconfdir}/${PN}/cloud.conf.d ${D}${sysconfdir}/${PN}/cloud.profiles.d ${D}${sysconfdir}/${PN}/cloud.providers.d - - install -d ${D}${PYTHON_SITEPACKAGES_DIR}/${PN}-tests/ - cp -r ${S}/tests/ ${D}${PYTHON_SITEPACKAGES_DIR}/${PN}-tests/ -} - -ALLOW_EMPTY_${PN} = "1" -FILES_${PN} = "" - -INITSCRIPT_PACKAGES = "${PN}-minion ${PN}-api ${PN}-master ${PN}-syndic" - -DESCRIPTION_COMMON = "salt is a powerful remote execution manager that can be used to administer servers in a\ - fast and efficient way. It allows commands to be executed across large groups of servers. This means systems\ - can be easily managed, but data can also be easily gathered. Quick introspection into running systems becomes\ - a reality. Remote execution is usually used to set up a certain state on a remote system. Salt addresses this\ - problem as well, the salt state system uses salt state files to define the state a server needs to be in. \ -Between the remote execution system, and state management Salt addresses the backbone of cloud and data center\ - management." - -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 = "python (>=2.6), ${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)}" -RRECOMMENDS_${PN}-minion_append_x64 = "dmidecode" -RSUGGESTS_${PN}-minion = "python-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" -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 (>= 2.7.5-5) python (< 2.8) 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)" -CONFFILES_${PN}-common="${sysconfdir}/logrotate.d/${PN}-common" -FILES_${PN}-common = "${bindir}/${PN}-call ${libdir}/python2.7/ ${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 = "python (>= 2.6) ${PN}-common (= ${EXTENDPKGV}) python-msgpack" -CONFFILES_${PN}-ssh="${sysconfdir}/${PN}/roster" -FILES_${PN}-ssh = "${bindir}/${PN}-ssh ${CONFFILES_${PN}-ssh}" - -SUMMARY_${PN}-api = "generic, modular network access system" -DESCRIPTION_${PN}-api = "a modular interface on top of Salt that can provide a variety of entry points into a \ -running Salt system. It can start and manage multiple interfaces allowing a REST API to coexist with XMLRPC or \ -even a Websocket API. The Salt API system is used to expose the fundamental aspects of Salt control to external\ - 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 = "python (>= 2.6) ${PN}-master" -RSUGGESTS_${PN}-api = "python-cherrypy" -CONFFILES_${PN}-api = "${sysconfdir}/init.d/${PN}-api" -FILES_${PN}-api = "${bindir}/${PN}-api ${CONFFILES_${PN}-api}" -INITSCRIPT_NAME_${PN}-api = "${PN}-api" -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 = "python (>= 2.6) ${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)}" -CONFFILES_${PN}-master="${sysconfdir}/init.d/${PN}-master ${sysconfdir}/${PN}/master" -RSUGGESTS_${PN}-master = "python-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" - -SUMMARY_${PN}-syndic = "master-of-masters for salt, the distributed remote execution system" -DESCRIPTION_${PN}-syndic = "${DESCRIPTION_COMMON} This particular package provides the master of masters for \ -salt; it enables the management of multiple masters at a time." -RDEPENDS_${PN}-syndic = "python (>= 2.6) ${PN}-master (= ${EXTENDPKGV})" -CONFFILES_${PN}-syndic="${sysconfdir}/init.d/${PN}-syndic" -FILES_${PN}-syndic = "${bindir}/${PN}-syndic ${CONFFILES_${PN}-syndic}" -INITSCRIPT_NAME_${PN}-syndic = "${PN}-syndic" -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 = "python (>= 2.6) ${PN}-common (= ${EXTENDPKGV})" -RSUGGESTS_${PN}-cloud = "python-netaddr python-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-salttesting python-tests python-image bash" -FILES_${PN}-tests = "${PYTHON_SITEPACKAGES_DIR}/salt-tests/tests/" - -FILES_${PN}-bash-completion = "${sysconfdir}/bash_completion.d/${PN}-common" diff --git a/meta-openstack/recipes-support/salt/salt_2018.3.0.bb b/meta-openstack/recipes-support/salt/salt_2018.3.0.bb new file mode 100644 index 0000000..a4022be --- /dev/null +++ b/meta-openstack/recipes-support/salt/salt_2018.3.0.bb @@ -0,0 +1,164 @@ +HOMEPAGE = "http://saltstack.com/" +SECTION = "admin" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=fb92f464675f6b5df90f540d60237915" +DEPENDS = "\ + python-msgpack \ + python-pyyaml \ + python-jinja2 \ + python-markupsafe \ +" + +PACKAGECONFIG ??= "zeromq" +PACKAGECONFIG[zeromq] = ",,python-pyzmq python-pycrypto," +PACKAGECONFIG[tcp] = ",,python-pycrypto" + +SRC_URI = "https://files.pythonhosted.org/packages/source/s/${PN}/${PN}-${PV}.tar.gz \ + file://set_python_location_hashbang.patch \ + file://minion \ + file://salt-minion \ + file://salt-common.bash_completion \ + file://salt-common.logrotate \ + file://salt-api \ + file://salt-master \ + file://master \ + file://salt-syndic \ + file://cloud \ + file://roster \ +" + +SRC_URI[md5sum] = "b6ec271b59554b9af7ff4005028434b5" +SRC_URI[sha256sum] = "a0a45d22fdf6961542a419b7e09568a3118e2b019ffe7bab9dee5aeb55b56b31" + +S = "${WORKDIR}/${PN}-${PV}" + +inherit setuptools update-rc.d + +# Avoid a QA Warning triggered by the test package including a file +# with a .a extension +INSANE_SKIP_${PN}-tests += "staticdev" + +# Note ${PN}-tests must be before ${PN}-common in the PACKAGES variable +# in order for ${PN}-tests to own the correct FILES. +PACKAGES += "\ + ${PN}-tests \ + ${PN}-api \ + ${PN}-cloud \ + ${PN}-common \ + ${PN}-master \ + ${PN}-minion \ + ${PN}-ssh \ + ${PN}-syndic \ + ${PN}-bash-completion \ +" + +do_install_append() { + install -d ${D}${sysconfdir}/bash_completion.d/ + install -m 0644 ${WORKDIR}/salt-common.bash_completion ${D}${sysconfdir}/bash_completion.d/${PN}-common + install -d ${D}${sysconfdir}/logrotate.d/ + install -m 0644 ${WORKDIR}/salt-common.logrotate ${D}${sysconfdir}/logrotate.d/${PN}-common + install -d ${D}${sysconfdir}/init.d/ + install -m 0755 ${WORKDIR}/salt-minion ${D}${sysconfdir}/init.d/${PN}-minion + install -m 0755 ${WORKDIR}/salt-api ${D}${sysconfdir}/init.d/${PN}-api + install -m 0755 ${WORKDIR}/salt-master ${D}${sysconfdir}/init.d/${PN}-master + install -m 0755 ${WORKDIR}/salt-syndic ${D}${sysconfdir}/init.d/${PN}-syndic + install -d ${D}${sysconfdir}/${PN}/ + install -m 0644 ${WORKDIR}/minion ${D}${sysconfdir}/${PN}/minion + install -m 0644 ${WORKDIR}/master ${D}${sysconfdir}/${PN}/master + install -m 0644 ${WORKDIR}/cloud ${D}${sysconfdir}/${PN}/cloud + install -m 0644 ${WORKDIR}/roster ${D}${sysconfdir}/${PN}/roster + install -d ${D}${sysconfdir}/${PN}/cloud.conf.d ${D}${sysconfdir}/${PN}/cloud.profiles.d ${D}${sysconfdir}/${PN}/cloud.providers.d + + install -d ${D}${PYTHON_SITEPACKAGES_DIR}/${PN}-tests/ + cp -r ${S}/tests/ ${D}${PYTHON_SITEPACKAGES_DIR}/${PN}-tests/ +} + +ALLOW_EMPTY_${PN} = "1" +FILES_${PN} = "" + +INITSCRIPT_PACKAGES = "${PN}-minion ${PN}-api ${PN}-master ${PN}-syndic" + +DESCRIPTION_COMMON = "salt is a powerful remote execution manager that can be used to administer servers in a\ + fast and efficient way. It allows commands to be executed across large groups of servers. This means systems\ + can be easily managed, but data can also be easily gathered. Quick introspection into running systems becomes\ + a reality. Remote execution is usually used to set up a certain state on a remote system. Salt addresses this\ + problem as well, the salt state system uses salt state files to define the state a server needs to be in. \ +Between the remote execution system, and state management Salt addresses the backbone of cloud and data center\ + management." + +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)}" +RRECOMMENDS_${PN}-minion_append_x64 = "dmidecode" +RSUGGESTS_${PN}-minion = "python-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" +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)" +CONFFILES_${PN}-common="${sysconfdir}/logrotate.d/${PN}-common" +FILES_${PN}-common = "${bindir}/${PN}-call ${libdir}/python2.7/ ${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" +CONFFILES_${PN}-ssh="${sysconfdir}/${PN}/roster" +FILES_${PN}-ssh = "${bindir}/${PN}-ssh ${CONFFILES_${PN}-ssh}" + +SUMMARY_${PN}-api = "generic, modular network access system" +DESCRIPTION_${PN}-api = "a modular interface on top of Salt that can provide a variety of entry points into a \ +running Salt system. It can start and manage multiple interfaces allowing a REST API to coexist with XMLRPC or \ +even a Websocket API. The Salt API system is used to expose the fundamental aspects of Salt control to external\ + 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" +CONFFILES_${PN}-api = "${sysconfdir}/init.d/${PN}-api" +FILES_${PN}-api = "${bindir}/${PN}-api ${CONFFILES_${PN}-api}" +INITSCRIPT_NAME_${PN}-api = "${PN}-api" +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)}" +CONFFILES_${PN}-master="${sysconfdir}/init.d/${PN}-master ${sysconfdir}/${PN}/master" +RSUGGESTS_${PN}-master = "python-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" + +SUMMARY_${PN}-syndic = "master-of-masters for salt, the distributed remote execution system" +DESCRIPTION_${PN}-syndic = "${DESCRIPTION_COMMON} This particular package provides the master of masters for \ +salt; it enables the management of multiple masters at a time." +RDEPENDS_${PN}-syndic = "${PN}-master (= ${EXTENDPKGV})" +CONFFILES_${PN}-syndic="${sysconfdir}/init.d/${PN}-syndic" +FILES_${PN}-syndic = "${bindir}/${PN}-syndic ${CONFFILES_${PN}-syndic}" +INITSCRIPT_NAME_${PN}-syndic = "${PN}-syndic" +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" +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" +FILES_${PN}-tests = "${PYTHON_SITEPACKAGES_DIR}/salt-tests/tests/" + +FILES_${PN}-bash-completion = "${sysconfdir}/bash_completion.d/${PN}-common" -- cgit v1.2.3-54-g00ecf