diff options
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-heat_git.bb')
-rw-r--r-- | meta-openstack/recipes-devtools/python/python-heat_git.bb | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-heat_git.bb b/meta-openstack/recipes-devtools/python/python-heat_git.bb index a3102ff..0f2f194 100644 --- a/meta-openstack/recipes-devtools/python/python-heat_git.bb +++ b/meta-openstack/recipes-devtools/python/python-heat_git.bb | |||
@@ -57,7 +57,7 @@ python () { | |||
57 | d.setVarFlags("SERVICECREATE_PARAM_%s-cfn" % d.getVar('SRCNAME',True), flags) | 57 | d.setVarFlags("SERVICECREATE_PARAM_%s-cfn" % d.getVar('SRCNAME',True), flags) |
58 | } | 58 | } |
59 | 59 | ||
60 | do_install_append() { | 60 | do_install:append() { |
61 | TEMPLATE_CONF_DIR=${S}${sysconfdir}/${SRCNAME} | 61 | TEMPLATE_CONF_DIR=${S}${sysconfdir}/${SRCNAME} |
62 | HEAT_CONF_DIR=${D}${sysconfdir}/${SRCNAME} | 62 | HEAT_CONF_DIR=${D}${sysconfdir}/${SRCNAME} |
63 | 63 | ||
@@ -106,7 +106,7 @@ do_install_append() { | |||
106 | fi | 106 | fi |
107 | } | 107 | } |
108 | 108 | ||
109 | pkg_postinst_${SRCNAME}-setup () { | 109 | pkg_postinst:${SRCNAME}-setup () { |
110 | if [ -z "$D" ]; then | 110 | if [ -z "$D" ]; then |
111 | # This is to make sure postgres is configured and running | 111 | # This is to make sure postgres is configured and running |
112 | if ! pidof postmaster > /dev/null; then | 112 | if ! pidof postmaster > /dev/null; then |
@@ -127,30 +127,30 @@ PACKAGES += "${SRCNAME}-tests ${SRCNAME}-templates ${SRCNAME}-common ${SRCNAME}- | |||
127 | PACKAGES += "${SRCNAME}-setup" | 127 | PACKAGES += "${SRCNAME}-setup" |
128 | PACKAGES += "${SRCNAME}-cfn" | 128 | PACKAGES += "${SRCNAME}-cfn" |
129 | 129 | ||
130 | RDEPENDS_${SRCNAME}-tests += " bash" | 130 | RDEPENDS:${SRCNAME}-tests += " bash" |
131 | 131 | ||
132 | ALLOW_EMPTY_${SRCNAME}-tests = "1" | 132 | ALLOW_EMPTY:${SRCNAME}-tests = "1" |
133 | ALLOW_EMPTY_${SRCNAME}-setup = "1" | 133 | ALLOW_EMPTY:${SRCNAME}-setup = "1" |
134 | ALLOW_EMPTY_${SRCNAME}-templates = "1" | 134 | ALLOW_EMPTY:${SRCNAME}-templates = "1" |
135 | ALLOW_EMPTY_${SRCNAME}-cfn = "1" | 135 | ALLOW_EMPTY:${SRCNAME}-cfn = "1" |
136 | 136 | ||
137 | FILES_${PN} = "${libdir}/*" | 137 | FILES:${PN} = "${libdir}/*" |
138 | 138 | ||
139 | FILES_${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/run_tests.sh" | 139 | FILES:${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/run_tests.sh" |
140 | 140 | ||
141 | FILES_${SRCNAME}-templates = "${sysconfdir}/${SRCNAME}/templates/*" | 141 | FILES:${SRCNAME}-templates = "${sysconfdir}/${SRCNAME}/templates/*" |
142 | 142 | ||
143 | FILES_${SRCNAME}-common = "${sysconfdir}/${SRCNAME}/* \ | 143 | FILES:${SRCNAME}-common = "${sysconfdir}/${SRCNAME}/* \ |
144 | " | 144 | " |
145 | 145 | ||
146 | FILES_${SRCNAME}-api = "${bindir}/heat-api \ | 146 | FILES:${SRCNAME}-api = "${bindir}/heat-api \ |
147 | ${sysconfdir}/init.d/heat-api \ | 147 | ${sysconfdir}/init.d/heat-api \ |
148 | " | 148 | " |
149 | FILES_${SRCNAME}-api-cfn = "${bindir}/heat-api-cfn \ | 149 | FILES:${SRCNAME}-api-cfn = "${bindir}/heat-api-cfn \ |
150 | ${sysconfdir}/init.d/heat-api-cfn \ | 150 | ${sysconfdir}/init.d/heat-api-cfn \ |
151 | " | 151 | " |
152 | 152 | ||
153 | FILES_${SRCNAME}-engine = "${bindir}/heat-engine \ | 153 | FILES:${SRCNAME}-engine = "${bindir}/heat-engine \ |
154 | ${bindir}/* \ | 154 | ${bindir}/* \ |
155 | ${sysconfdir}/init.d/heat-engine \ | 155 | ${sysconfdir}/init.d/heat-engine \ |
156 | " | 156 | " |
@@ -165,7 +165,7 @@ DEPENDS += " \ | |||
165 | python-pbr-native \ | 165 | python-pbr-native \ |
166 | " | 166 | " |
167 | 167 | ||
168 | RDEPENDS_${PN} += " \ | 168 | RDEPENDS:${PN} += " \ |
169 | python-heatclient \ | 169 | python-heatclient \ |
170 | python-sqlalchemy \ | 170 | python-sqlalchemy \ |
171 | python-amqplib \ | 171 | python-amqplib \ |
@@ -246,20 +246,20 @@ RDEPENDS_${PN} += " \ | |||
246 | bash \ | 246 | bash \ |
247 | " | 247 | " |
248 | 248 | ||
249 | RDEPENDS_${SRCNAME}-engine = "${PN} ${SRCNAME}-templates ${SRCNAME}-common postgresql postgresql-client python-psycopg2 tgt ${SRCNAME}-cfn bash" | 249 | RDEPENDS:${SRCNAME}-engine = "${PN} ${SRCNAME}-templates ${SRCNAME}-common postgresql postgresql-client python-psycopg2 tgt ${SRCNAME}-cfn bash" |
250 | RDEPENDS_${SRCNAME}-api = "${SRCNAME}-engine" | 250 | RDEPENDS:${SRCNAME}-api = "${SRCNAME}-engine" |
251 | RDEPENDS_${SRCNAME}-api-cfn = "${SRCNAME}-engine" | 251 | RDEPENDS:${SRCNAME}-api-cfn = "${SRCNAME}-engine" |
252 | RDEPENDS_${SRCNAME}-setup = "postgresql sudo ${SRCNAME}-engine" | 252 | RDEPENDS:${SRCNAME}-setup = "postgresql sudo ${SRCNAME}-engine" |
253 | RDEPENDS_${SRCNAME}-templates = "postgresql sudo" | 253 | RDEPENDS:${SRCNAME}-templates = "postgresql sudo" |
254 | RDEPENDS_${SRCNAME}-cfn = "postgresql sudo" | 254 | RDEPENDS:${SRCNAME}-cfn = "postgresql sudo" |
255 | 255 | ||
256 | INITSCRIPT_PACKAGES = "${SRCNAME}-api ${SRCNAME}-api-cfn ${SRCNAME}-engine" | 256 | INITSCRIPT_PACKAGES = "${SRCNAME}-api ${SRCNAME}-api-cfn ${SRCNAME}-engine" |
257 | INITSCRIPT_NAME_${SRCNAME}-api = "${SRCNAME}-api" | 257 | INITSCRIPT_NAME:${SRCNAME}-api = "${SRCNAME}-api" |
258 | INITSCRIPT_PARAMS_${SRCNAME}-api = "${OS_DEFAULT_INITSCRIPT_PARAMS}" | 258 | INITSCRIPT_PARAMS:${SRCNAME}-api = "${OS_DEFAULT_INITSCRIPT_PARAMS}" |
259 | INITSCRIPT_NAME_${SRCNAME}-api-cfn = "${SRCNAME}-api-cfn" | 259 | INITSCRIPT_NAME:${SRCNAME}-api-cfn = "${SRCNAME}-api-cfn" |
260 | INITSCRIPT_PARAMS_${SRCNAME}-api-cfn = "${OS_DEFAULT_INITSCRIPT_PARAMS}" | 260 | INITSCRIPT_PARAMS:${SRCNAME}-api-cfn = "${OS_DEFAULT_INITSCRIPT_PARAMS}" |
261 | INITSCRIPT_NAME_${SRCNAME}-engine = "${SRCNAME}-engine" | 261 | INITSCRIPT_NAME:${SRCNAME}-engine = "${SRCNAME}-engine" |
262 | INITSCRIPT_PARAMS_${SRCNAME}-engine = "${OS_DEFAULT_INITSCRIPT_PARAMS}" | 262 | INITSCRIPT_PARAMS:${SRCNAME}-engine = "${OS_DEFAULT_INITSCRIPT_PARAMS}" |
263 | 263 | ||
264 | MONITOR_SERVICE_PACKAGES = "${SRCNAME}" | 264 | MONITOR_SERVICE_PACKAGES = "${SRCNAME}" |
265 | MONITOR_SERVICE_${SRCNAME} = "heat" | 265 | MONITOR_SERVICE_${SRCNAME} = "heat" |