diff options
author | Alejandro del Castillo <alejandro.delcastillo@ni.com> | 2015-09-29 18:25:39 -0500 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2015-10-02 08:53:13 -0400 |
commit | 1c74557a21a70485d13b429ba4a2238f264d64d3 (patch) | |
tree | ef5b158a19566d2033a55431da73e770690dcc8c /meta-openstack/recipes-support/salt | |
parent | dc3ee0ace7dc92e5bbb215ee0a3c20a2ef08e6bd (diff) | |
download | meta-cloud-services-1c74557a21a70485d13b429ba4a2238f264d64d3.tar.gz |
salt: upgrade to 2015.8
Follow Debian dependencies from official salt repo at repo.saltstack.com
Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack/recipes-support/salt')
-rw-r--r-- | meta-openstack/recipes-support/salt/salt_2015.8.0.bb (renamed from meta-openstack/recipes-support/salt/salt_2015.5.0.bb) | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/meta-openstack/recipes-support/salt/salt_2015.5.0.bb b/meta-openstack/recipes-support/salt/salt_2015.8.0.bb index 0eb6f9d..16c86ea 100644 --- a/meta-openstack/recipes-support/salt/salt_2015.5.0.bb +++ b/meta-openstack/recipes-support/salt/salt_2015.8.0.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | HOMEPAGE = "http://saltstack.com/" | 1 | HOMEPAGE = "http://saltstack.com/" |
2 | SECTION = "admin" | 2 | SECTION = "admin" |
3 | LICENSE = "Apache-2.0" | 3 | LICENSE = "Apache-2.0" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=5357642471cfab4740d1d0a20c51af6a" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b59c9134761722281bb895f65cb15e9a" |
5 | DEPENDS = "\ | 5 | DEPENDS = "\ |
6 | python-msgpack \ | 6 | python-msgpack \ |
7 | python-pyyaml \ | 7 | python-pyyaml \ |
@@ -9,7 +9,6 @@ DEPENDS = "\ | |||
9 | python-markupsafe \ | 9 | python-markupsafe \ |
10 | python-pyzmq \ | 10 | python-pyzmq \ |
11 | python-pycrypto \ | 11 | python-pycrypto \ |
12 | python-m2crypto \ | ||
13 | " | 12 | " |
14 | 13 | ||
15 | SRCNAME = "salt" | 14 | SRCNAME = "salt" |
@@ -27,8 +26,8 @@ SRC_URI = "http://pypi.python.org/packages/source/s/${SRCNAME}/${SRCNAME}-${PV}. | |||
27 | file://roster \ | 26 | file://roster \ |
28 | " | 27 | " |
29 | 28 | ||
30 | SRC_URI[md5sum] = "5091f15202c852a3e92692035b05c872" | 29 | SRC_URI[md5sum] = "a15842ef0582cca9d26143fe0a6180b7" |
31 | SRC_URI[sha256sum] = "e0d5b3ec220d8c956120bf2faa00bb7013e500eef7a697bc428cb179a136a5d2" | 30 | SRC_URI[sha256sum] = "71e1cb2eb1d4b30f3247f5590c00a2089190b8f9a90c9330dc9a65fae517ec9b" |
32 | 31 | ||
33 | S = "${WORKDIR}/${SRCNAME}-${PV}" | 32 | S = "${WORKDIR}/${SRCNAME}-${PV}" |
34 | 33 | ||
@@ -78,18 +77,18 @@ Between the remote execution system, and state management Salt addresses the bac | |||
78 | 77 | ||
79 | SUMMARY_${PN}-minion = "client package for salt, the distributed remote execution system" | 78 | SUMMARY_${PN}-minion = "client package for salt, the distributed remote execution system" |
80 | DESCRIPTION_${PN}-minion = "${DESCRIPTION_COMMON} This particular package provides the worker agent for salt." | 79 | DESCRIPTION_${PN}-minion = "${DESCRIPTION_COMMON} This particular package provides the worker agent for salt." |
81 | RDEPENDS_${PN}-minion = "python ${PN}-common (= ${EXTENDPKGV}) python-m2crypto python-pycrypto python-msgpack python-pyzmq (>= 13.1.0)" | 80 | RDEPENDS_${PN}-minion = "python (>=2.6), ${PN}-common (= ${EXTENDPKGV}) python-pycrypto python-msgpack python-pyzmq (>= 13.1.0)" |
82 | RRECOMMENDS_${PN}-minion_append_x64 = "dmidecode" | 81 | RRECOMMENDS_${PN}-minion_append_x64 = "dmidecode" |
83 | RSUGGESTS_${PN}-minion = "python-augeas" | 82 | RSUGGESTS_${PN}-minion = "python-augeas" |
84 | CONFFILES_${PN}-minion = "${sysconfdir}/${PN}/minion ${sysconfdir}/init.d/${PN}-minion" | 83 | CONFFILES_${PN}-minion = "${sysconfdir}/${PN}/minion ${sysconfdir}/init.d/${PN}-minion" |
85 | FILES_${PN}-minion = "${bindir}/${PN}-minion ${sysconfdir}/${PN}/minion.d/ ${CONFFILES_${PN}-minion}" | 84 | FILES_${PN}-minion = "${bindir}/${PN}-minion ${sysconfdir}/${PN}/minion.d/ ${CONFFILES_${PN}-minion} ${bindir}/${PN}-proxy" |
86 | INITSCRIPT_NAME_${PN}-minion = "${PN}-minion" | 85 | INITSCRIPT_NAME_${PN}-minion = "${PN}-minion" |
87 | INITSCRIPT_PARAMS_${PN}-minion = "defaults" | 86 | INITSCRIPT_PARAMS_${PN}-minion = "defaults" |
88 | 87 | ||
89 | SUMMARY_${PN}-common = "shared libraries that salt requires for all packages" | 88 | SUMMARY_${PN}-common = "shared libraries that salt requires for all packages" |
90 | DESCRIPTION_${PN}-common ="${DESCRIPTION_COMMON} This particular package provides shared libraries that \ | 89 | DESCRIPTION_${PN}-common ="${DESCRIPTION_COMMON} This particular package provides shared libraries that \ |
91 | salt-master, salt-minion, and salt-syndic require to function." | 90 | salt-master, salt-minion, and salt-syndic require to function." |
92 | RDEPENDS_${PN}-common = "python (>= 2.7) python (< 2.8) python-jinja2 python-pyyaml" | 91 | 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)" |
93 | RRECOMMENDS_${PN}-common = "lsb" | 92 | RRECOMMENDS_${PN}-common = "lsb" |
94 | RSUGGESTS_${PN}-common = "python-mako python-git" | 93 | RSUGGESTS_${PN}-common = "python-mako python-git" |
95 | RCONFLICTS_${PN}-common = "python-mako (< 0.7.0)" | 94 | RCONFLICTS_${PN}-common = "python-mako (< 0.7.0)" |
@@ -100,7 +99,7 @@ SUMMARY_${PN}-ssh = "remote manager to administer servers via salt" | |||
100 | DESCRIPTION_${PN}-ssh = "${DESCRIPTION_COMMON} This particular package provides the salt ssh controller. It \ | 99 | DESCRIPTION_${PN}-ssh = "${DESCRIPTION_COMMON} This particular package provides the salt ssh controller. It \ |
101 | is able to run salt modules and states on remote hosts via ssh. No minion or other salt specific software needs\ | 100 | is able to run salt modules and states on remote hosts via ssh. No minion or other salt specific software needs\ |
102 | to be installed on the remote host." | 101 | to be installed on the remote host." |
103 | RDEPENDS_${PN}-ssh = "python ${PN}-common (= ${EXTENDPKGV}) python-msgpack" | 102 | RDEPENDS_${PN}-ssh = "python (>= 2.6) ${PN}-common (= ${EXTENDPKGV}) python-msgpack" |
104 | CONFFILES_${PN}-ssh="${sysconfdir}/${PN}/roster" | 103 | CONFFILES_${PN}-ssh="${sysconfdir}/${PN}/roster" |
105 | FILES_${PN}-ssh = "${bindir}/${PN}-ssh ${CONFFILES_${PN}-ssh}" | 104 | FILES_${PN}-ssh = "${bindir}/${PN}-ssh ${CONFFILES_${PN}-ssh}" |
106 | 105 | ||
@@ -110,7 +109,7 @@ running Salt system. It can start and manage multiple interfaces allowing a REST | |||
110 | even a Websocket API. The Salt API system is used to expose the fundamental aspects of Salt control to external\ | 109 | even a Websocket API. The Salt API system is used to expose the fundamental aspects of Salt control to external\ |
111 | sources. salt-api acts as the bridge between Salt itself and REST, Websockets, etc. Documentation is available\ | 110 | sources. salt-api acts as the bridge between Salt itself and REST, Websockets, etc. Documentation is available\ |
112 | on Read the Docs: http://salt-api.readthedocs.org/" | 111 | on Read the Docs: http://salt-api.readthedocs.org/" |
113 | RDEPENDS_${PN}-api = "python ${PN}-master" | 112 | RDEPENDS_${PN}-api = "python (>= 2.6) ${PN}-master" |
114 | RSUGGESTS_${PN}-api = "python-cherrypy" | 113 | RSUGGESTS_${PN}-api = "python-cherrypy" |
115 | CONFFILES_${PN}-api = "${sysconfdir}/init.d/${PN}-api" | 114 | CONFFILES_${PN}-api = "${sysconfdir}/init.d/${PN}-api" |
116 | FILES_${PN}-api = "${bindir}/${PN}-api ${CONFFILES_${PN}-api}" | 115 | FILES_${PN}-api = "${bindir}/${PN}-api ${CONFFILES_${PN}-api}" |
@@ -119,16 +118,17 @@ INITSCRIPT_PARAMS_${PN}-api = "defaults" | |||
119 | 118 | ||
120 | SUMMARY_${PN}-master = "remote manager to administer servers via salt" | 119 | SUMMARY_${PN}-master = "remote manager to administer servers via salt" |
121 | DESCRIPTION_${PN}-master ="${DESCRIPTION_COMMON} This particular package provides the salt controller." | 120 | DESCRIPTION_${PN}-master ="${DESCRIPTION_COMMON} This particular package provides the salt controller." |
122 | RDEPENDS_${PN}-master = "python ${PN}-common (= ${EXTENDPKGV}) python-m2crypto python-pycrypto python-msgpack python-pyzmq (>= 13.1.0)" | 121 | RDEPENDS_${PN}-master = "python (>= 2.6) ${PN}-common (= ${EXTENDPKGV}) python-pycrypto python-msgpack python-pyzmq (>= 13.1.0)" |
123 | CONFFILES_${PN}-master="${sysconfdir}/init.d/${PN}-master ${sysconfdir}/${PN}/master" | 122 | CONFFILES_${PN}-master="${sysconfdir}/init.d/${PN}-master ${sysconfdir}/${PN}/master" |
124 | FILES_${PN}-master = "${bindir}/${PN} ${bindir}/${PN}-cp ${bindir}/${PN}-key ${bindir}/${PN}-master ${bindir}/${PN}-run ${bindir}/${PN}-unity ${CONFFILES_${PN}-master}" | 123 | RSUGGESTS_${PN}-master = "python-git" |
124 | 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}" | ||
125 | INITSCRIPT_NAME_${PN}-master = "${PN}-master" | 125 | INITSCRIPT_NAME_${PN}-master = "${PN}-master" |
126 | INITSCRIPT_PARAMS_${PN}-master = "defaults" | 126 | INITSCRIPT_PARAMS_${PN}-master = "defaults" |
127 | 127 | ||
128 | SUMMARY_${PN}-syndic = "master-of-masters for salt, the distributed remote execution system" | 128 | SUMMARY_${PN}-syndic = "master-of-masters for salt, the distributed remote execution system" |
129 | DESCRIPTION_${PN}-syndic = "${DESCRIPTION_COMMON} This particular package provides the master of masters for \ | 129 | DESCRIPTION_${PN}-syndic = "${DESCRIPTION_COMMON} This particular package provides the master of masters for \ |
130 | salt; it enables the management of multiple masters at a time." | 130 | salt; it enables the management of multiple masters at a time." |
131 | RDEPENDS_${PN}-syndic = "python ${PN}-master (= ${EXTENDPKGV})" | 131 | RDEPENDS_${PN}-syndic = "python (>= 2.6) ${PN}-master (= ${EXTENDPKGV})" |
132 | CONFFILES_${PN}-syndic="${sysconfdir}/init.d/${PN}-syndic" | 132 | CONFFILES_${PN}-syndic="${sysconfdir}/init.d/${PN}-syndic" |
133 | FILES_${PN}-syndic = "${bindir}/${PN}-syndic ${CONFFILES_${PN}-syndic}" | 133 | FILES_${PN}-syndic = "${bindir}/${PN}-syndic ${CONFFILES_${PN}-syndic}" |
134 | INITSCRIPT_NAME_${PN}-syndic = "${PN}-syndic" | 134 | INITSCRIPT_NAME_${PN}-syndic = "${PN}-syndic" |
@@ -136,7 +136,7 @@ INITSCRIPT_PARAMS_${PN}-syndic = "defaults" | |||
136 | 136 | ||
137 | SUMMARY_${PN}-cloud = "public cloud VM management system" | 137 | SUMMARY_${PN}-cloud = "public cloud VM management system" |
138 | DESCRIPTION_${PN}-cloud = "provision virtual machines on various public clouds via a cleanly controlled profile and mapping system." | 138 | DESCRIPTION_${PN}-cloud = "provision virtual machines on various public clouds via a cleanly controlled profile and mapping system." |
139 | RDEPENDS_${PN}-cloud = "python ${PN}-common (= ${EXTENDPKGV}) python-msgpack python-requests" | 139 | RDEPENDS_${PN}-cloud = "python (>= 2.6) ${PN}-common (= ${EXTENDPKGV})" |
140 | RSUGGESTS_${PN}-cloud = "python-netaddr python-botocore" | 140 | RSUGGESTS_${PN}-cloud = "python-netaddr python-botocore" |
141 | CONFFILES_${PN}-cloud = "${sysconfdir}/${PN}/cloud" | 141 | CONFFILES_${PN}-cloud = "${sysconfdir}/${PN}/cloud" |
142 | FILES_${PN}-cloud = "${bindir}/${PN}-cloud ${sysconfdir}/${PN}/cloud.conf.d/ ${sysconfdir}/${PN}/cloud.profiles.d/ ${sysconfdir}/${PN}/cloud.providers.d/ ${CONFFILES_${PN}-cloud}" | 142 | FILES_${PN}-cloud = "${bindir}/${PN}-cloud ${sysconfdir}/${PN}/cloud.conf.d/ ${sysconfdir}/${PN}/cloud.profiles.d/ ${sysconfdir}/${PN}/cloud.providers.d/ ${CONFFILES_${PN}-cloud}" |