diff options
author | Sergey Kizunov <sergey.kizunov@ni.com> | 2018-08-20 19:00:23 +0300 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2018-08-28 08:21:28 -0400 |
commit | a15b423499cdbb16fff8b79f7bae2cadc53ccebc (patch) | |
tree | df0aff43f2b96e4990ca93c7e2e03f52cfe924c2 | |
parent | f363842dd3bd92e0ca5d80543b823fbc8abd5522 (diff) | |
download | meta-cloud-services-a15b423499cdbb16fff8b79f7bae2cadc53ccebc.tar.gz |
salt: bump 2016.11 -> 2018.3
Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r-- | meta-openstack/recipes-support/salt/salt_2018.3.0.bb (renamed from meta-openstack/recipes-support/salt/salt_2016.11.0.bb) | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/meta-openstack/recipes-support/salt/salt_2016.11.0.bb b/meta-openstack/recipes-support/salt/salt_2018.3.0.bb index ba1def7..a4022be 100644 --- a/meta-openstack/recipes-support/salt/salt_2016.11.0.bb +++ b/meta-openstack/recipes-support/salt/salt_2018.3.0.bb | |||
@@ -13,8 +13,7 @@ PACKAGECONFIG ??= "zeromq" | |||
13 | PACKAGECONFIG[zeromq] = ",,python-pyzmq python-pycrypto," | 13 | PACKAGECONFIG[zeromq] = ",,python-pyzmq python-pycrypto," |
14 | PACKAGECONFIG[tcp] = ",,python-pycrypto" | 14 | PACKAGECONFIG[tcp] = ",,python-pycrypto" |
15 | 15 | ||
16 | SRCNAME = "salt" | 16 | SRC_URI = "https://files.pythonhosted.org/packages/source/s/${PN}/${PN}-${PV}.tar.gz \ |
17 | SRC_URI = "https://files.pythonhosted.org/packages/source/s/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \ | ||
18 | file://set_python_location_hashbang.patch \ | 17 | file://set_python_location_hashbang.patch \ |
19 | file://minion \ | 18 | file://minion \ |
20 | file://salt-minion \ | 19 | file://salt-minion \ |
@@ -28,10 +27,10 @@ SRC_URI = "https://files.pythonhosted.org/packages/source/s/${SRCNAME}/${SRCNAME | |||
28 | file://roster \ | 27 | file://roster \ |
29 | " | 28 | " |
30 | 29 | ||
31 | SRC_URI[md5sum] = "eced07a652cc6a31870fc098d5325a9c" | 30 | SRC_URI[md5sum] = "b6ec271b59554b9af7ff4005028434b5" |
32 | SRC_URI[sha256sum] = "b516285926ee95cedc64ecddab05d14422b7c8819c9f6d046a431c41d608e6bc" | 31 | SRC_URI[sha256sum] = "a0a45d22fdf6961542a419b7e09568a3118e2b019ffe7bab9dee5aeb55b56b31" |
33 | 32 | ||
34 | S = "${WORKDIR}/${SRCNAME}-${PV}" | 33 | S = "${WORKDIR}/${PN}-${PV}" |
35 | 34 | ||
36 | inherit setuptools update-rc.d | 35 | inherit setuptools update-rc.d |
37 | 36 | ||
@@ -89,7 +88,7 @@ Between the remote execution system, and state management Salt addresses the bac | |||
89 | 88 | ||
90 | SUMMARY_${PN}-minion = "client package for salt, the distributed remote execution system" | 89 | SUMMARY_${PN}-minion = "client package for salt, the distributed remote execution system" |
91 | DESCRIPTION_${PN}-minion = "${DESCRIPTION_COMMON} This particular package provides the worker agent for salt." | 90 | DESCRIPTION_${PN}-minion = "${DESCRIPTION_COMMON} This particular package provides the worker agent for salt." |
92 | RDEPENDS_${PN}-minion = "python (>=2.6), ${PN}-common (= ${EXTENDPKGV}) python-msgpack" | 91 | RDEPENDS_${PN}-minion = "${PN}-common (= ${EXTENDPKGV}) python-msgpack" |
93 | RDEPENDS_${PN}-minion += "${@bb.utils.contains('PACKAGECONFIG', 'zeromq', 'python-pycrypto python-pyzmq (>= 13.1.0)', '',d)}" | 92 | RDEPENDS_${PN}-minion += "${@bb.utils.contains('PACKAGECONFIG', 'zeromq', 'python-pycrypto python-pyzmq (>= 13.1.0)', '',d)}" |
94 | RDEPENDS_${PN}-minion += "${@bb.utils.contains('PACKAGECONFIG', 'tcp', 'python-pycrypto', '',d)}" | 93 | RDEPENDS_${PN}-minion += "${@bb.utils.contains('PACKAGECONFIG', 'tcp', 'python-pycrypto', '',d)}" |
95 | RRECOMMENDS_${PN}-minion_append_x64 = "dmidecode" | 94 | RRECOMMENDS_${PN}-minion_append_x64 = "dmidecode" |
@@ -102,7 +101,7 @@ INITSCRIPT_PARAMS_${PN}-minion = "defaults" | |||
102 | SUMMARY_${PN}-common = "shared libraries that salt requires for all packages" | 101 | SUMMARY_${PN}-common = "shared libraries that salt requires for all packages" |
103 | DESCRIPTION_${PN}-common ="${DESCRIPTION_COMMON} This particular package provides shared libraries that \ | 102 | DESCRIPTION_${PN}-common ="${DESCRIPTION_COMMON} This particular package provides shared libraries that \ |
104 | salt-master, salt-minion, and salt-syndic require to function." | 103 | salt-master, salt-minion, and salt-syndic require to function." |
105 | 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)" | 104 | RDEPENDS_${PN}-common = "python-dateutil python-jinja2 python-pyyaml python-requests (>= 1.0.0) python-tornado (>= 4.2.1)" |
106 | RRECOMMENDS_${PN}-common = "lsb python-futures" | 105 | RRECOMMENDS_${PN}-common = "lsb python-futures" |
107 | RSUGGESTS_${PN}-common = "python-mako python-git" | 106 | RSUGGESTS_${PN}-common = "python-mako python-git" |
108 | RCONFLICTS_${PN}-common = "python-mako (< 0.7.0)" | 107 | RCONFLICTS_${PN}-common = "python-mako (< 0.7.0)" |
@@ -113,7 +112,7 @@ SUMMARY_${PN}-ssh = "remote manager to administer servers via salt" | |||
113 | DESCRIPTION_${PN}-ssh = "${DESCRIPTION_COMMON} This particular package provides the salt ssh controller. It \ | 112 | DESCRIPTION_${PN}-ssh = "${DESCRIPTION_COMMON} This particular package provides the salt ssh controller. It \ |
114 | is able to run salt modules and states on remote hosts via ssh. No minion or other salt specific software needs\ | 113 | is able to run salt modules and states on remote hosts via ssh. No minion or other salt specific software needs\ |
115 | to be installed on the remote host." | 114 | to be installed on the remote host." |
116 | RDEPENDS_${PN}-ssh = "python (>= 2.6) ${PN}-common (= ${EXTENDPKGV}) python-msgpack" | 115 | RDEPENDS_${PN}-ssh = "${PN}-common (= ${EXTENDPKGV}) python-msgpack" |
117 | CONFFILES_${PN}-ssh="${sysconfdir}/${PN}/roster" | 116 | CONFFILES_${PN}-ssh="${sysconfdir}/${PN}/roster" |
118 | FILES_${PN}-ssh = "${bindir}/${PN}-ssh ${CONFFILES_${PN}-ssh}" | 117 | FILES_${PN}-ssh = "${bindir}/${PN}-ssh ${CONFFILES_${PN}-ssh}" |
119 | 118 | ||
@@ -123,7 +122,7 @@ running Salt system. It can start and manage multiple interfaces allowing a REST | |||
123 | even a Websocket API. The Salt API system is used to expose the fundamental aspects of Salt control to external\ | 122 | even a Websocket API. The Salt API system is used to expose the fundamental aspects of Salt control to external\ |
124 | sources. salt-api acts as the bridge between Salt itself and REST, Websockets, etc. Documentation is available\ | 123 | sources. salt-api acts as the bridge between Salt itself and REST, Websockets, etc. Documentation is available\ |
125 | on Read the Docs: http://salt-api.readthedocs.org/" | 124 | on Read the Docs: http://salt-api.readthedocs.org/" |
126 | RDEPENDS_${PN}-api = "python (>= 2.6) ${PN}-master" | 125 | RDEPENDS_${PN}-api = "${PN}-master" |
127 | RSUGGESTS_${PN}-api = "python-cherrypy" | 126 | RSUGGESTS_${PN}-api = "python-cherrypy" |
128 | CONFFILES_${PN}-api = "${sysconfdir}/init.d/${PN}-api" | 127 | CONFFILES_${PN}-api = "${sysconfdir}/init.d/${PN}-api" |
129 | FILES_${PN}-api = "${bindir}/${PN}-api ${CONFFILES_${PN}-api}" | 128 | FILES_${PN}-api = "${bindir}/${PN}-api ${CONFFILES_${PN}-api}" |
@@ -132,7 +131,7 @@ INITSCRIPT_PARAMS_${PN}-api = "defaults" | |||
132 | 131 | ||
133 | SUMMARY_${PN}-master = "remote manager to administer servers via salt" | 132 | SUMMARY_${PN}-master = "remote manager to administer servers via salt" |
134 | DESCRIPTION_${PN}-master ="${DESCRIPTION_COMMON} This particular package provides the salt controller." | 133 | DESCRIPTION_${PN}-master ="${DESCRIPTION_COMMON} This particular package provides the salt controller." |
135 | RDEPENDS_${PN}-master = "python (>= 2.6) ${PN}-common (= ${EXTENDPKGV}) python-msgpack" | 134 | RDEPENDS_${PN}-master = "${PN}-common (= ${EXTENDPKGV}) python-msgpack" |
136 | RDEPENDS_${PN}-master += "${@bb.utils.contains('PACKAGECONFIG', 'zeromq', 'python-pycrypto python-pyzmq (>= 13.1.0)', '',d)}" | 135 | RDEPENDS_${PN}-master += "${@bb.utils.contains('PACKAGECONFIG', 'zeromq', 'python-pycrypto python-pyzmq (>= 13.1.0)', '',d)}" |
137 | RDEPENDS_${PN}-master += "${@bb.utils.contains('PACKAGECONFIG', 'tcp', 'python-pycrypto', '',d)}" | 136 | RDEPENDS_${PN}-master += "${@bb.utils.contains('PACKAGECONFIG', 'tcp', 'python-pycrypto', '',d)}" |
138 | CONFFILES_${PN}-master="${sysconfdir}/init.d/${PN}-master ${sysconfdir}/${PN}/master" | 137 | CONFFILES_${PN}-master="${sysconfdir}/init.d/${PN}-master ${sysconfdir}/${PN}/master" |
@@ -144,7 +143,7 @@ INITSCRIPT_PARAMS_${PN}-master = "defaults" | |||
144 | SUMMARY_${PN}-syndic = "master-of-masters for salt, the distributed remote execution system" | 143 | SUMMARY_${PN}-syndic = "master-of-masters for salt, the distributed remote execution system" |
145 | DESCRIPTION_${PN}-syndic = "${DESCRIPTION_COMMON} This particular package provides the master of masters for \ | 144 | DESCRIPTION_${PN}-syndic = "${DESCRIPTION_COMMON} This particular package provides the master of masters for \ |
146 | salt; it enables the management of multiple masters at a time." | 145 | salt; it enables the management of multiple masters at a time." |
147 | RDEPENDS_${PN}-syndic = "python (>= 2.6) ${PN}-master (= ${EXTENDPKGV})" | 146 | RDEPENDS_${PN}-syndic = "${PN}-master (= ${EXTENDPKGV})" |
148 | CONFFILES_${PN}-syndic="${sysconfdir}/init.d/${PN}-syndic" | 147 | CONFFILES_${PN}-syndic="${sysconfdir}/init.d/${PN}-syndic" |
149 | FILES_${PN}-syndic = "${bindir}/${PN}-syndic ${CONFFILES_${PN}-syndic}" | 148 | FILES_${PN}-syndic = "${bindir}/${PN}-syndic ${CONFFILES_${PN}-syndic}" |
150 | INITSCRIPT_NAME_${PN}-syndic = "${PN}-syndic" | 149 | INITSCRIPT_NAME_${PN}-syndic = "${PN}-syndic" |
@@ -152,14 +151,14 @@ INITSCRIPT_PARAMS_${PN}-syndic = "defaults" | |||
152 | 151 | ||
153 | SUMMARY_${PN}-cloud = "public cloud VM management system" | 152 | SUMMARY_${PN}-cloud = "public cloud VM management system" |
154 | DESCRIPTION_${PN}-cloud = "provision virtual machines on various public clouds via a cleanly controlled profile and mapping system." | 153 | DESCRIPTION_${PN}-cloud = "provision virtual machines on various public clouds via a cleanly controlled profile and mapping system." |
155 | RDEPENDS_${PN}-cloud = "python (>= 2.6) ${PN}-common (= ${EXTENDPKGV})" | 154 | RDEPENDS_${PN}-cloud = "${PN}-common (= ${EXTENDPKGV})" |
156 | RSUGGESTS_${PN}-cloud = "python-netaddr python-botocore" | 155 | RSUGGESTS_${PN}-cloud = "python-netaddr python-botocore" |
157 | CONFFILES_${PN}-cloud = "${sysconfdir}/${PN}/cloud" | 156 | CONFFILES_${PN}-cloud = "${sysconfdir}/${PN}/cloud" |
158 | FILES_${PN}-cloud = "${bindir}/${PN}-cloud ${sysconfdir}/${PN}/cloud.conf.d/ ${sysconfdir}/${PN}/cloud.profiles.d/ ${sysconfdir}/${PN}/cloud.providers.d/ ${CONFFILES_${PN}-cloud}" | 157 | FILES_${PN}-cloud = "${bindir}/${PN}-cloud ${sysconfdir}/${PN}/cloud.conf.d/ ${sysconfdir}/${PN}/cloud.profiles.d/ ${sysconfdir}/${PN}/cloud.providers.d/ ${CONFFILES_${PN}-cloud}" |
159 | 158 | ||
160 | SUMMARY_${PN}-tests = "salt stack test suite" | 159 | SUMMARY_${PN}-tests = "salt stack test suite" |
161 | DESCRIPTION_${PN}-tests ="${DESCRIPTION_COMMON} This particular package provides the salt unit test suite." | 160 | DESCRIPTION_${PN}-tests ="${DESCRIPTION_COMMON} This particular package provides the salt unit test suite." |
162 | RDEPENDS_${PN}-tests = "${PN}-common python-salttesting python-tests python-image bash" | 161 | RDEPENDS_${PN}-tests = "${PN}-common python-pytest-salt python-tests python-image bash" |
163 | FILES_${PN}-tests = "${PYTHON_SITEPACKAGES_DIR}/salt-tests/tests/" | 162 | FILES_${PN}-tests = "${PYTHON_SITEPACKAGES_DIR}/salt-tests/tests/" |
164 | 163 | ||
165 | FILES_${PN}-bash-completion = "${sysconfdir}/bash_completion.d/${PN}-common" | 164 | FILES_${PN}-bash-completion = "${sysconfdir}/bash_completion.d/${PN}-common" |