Skip to content

Commit b0642f6

Browse files
gilzellnernir0s
gilzellner
authored and
nir0s
committed
CFY-3955-embedded python
1 parent 3103419 commit b0642f6

File tree

7 files changed

+31
-54
lines changed

7 files changed

+31
-54
lines changed

‎aws-ec2-manager-blueprint.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -171,15 +171,15 @@ inputs:
171171
#############################
172172
rest_service_rpm_source_url:
173173
type: string
174-
default: cloudify-rest-service-3.4.0-m5_b394.x86_64.rpm
174+
default: cloudify-rest-service-3.4.0~m5-394.el7.x86_64.rpm
175175

176-
management_worker_rpm_source_url:
176+
amqpinflux_rpm_source_url:
177177
type: string
178-
default: cloudify-management-worker-3.4.0-m5_b394.x86_64.rpm
178+
default: cloudify-amqp-influxdb-3.4.0~m5-394.el7.x86_64.rpm
179179

180-
amqpinflux_rpm_source_url:
180+
management_worker_rpm_source_url:
181181
type: string
182-
default: cloudify-amqp-influx-3.4.0-m5_b394.x86_64.rpm
182+
default: cloudify-mgmt-worker-3.4.0~m5-394.el7.x86_64.rpm
183183

184184
cloudify_resources_url:
185185
type: string
@@ -219,7 +219,7 @@ inputs:
219219

220220
elasticsearch_curator_rpm_source_url:
221221
type: string
222-
default: elasticsearch-curator-3.2.3-1.x86_64.rpm
222+
default: elasticsearch-curator-3.2.3-2.el7.x86_64.rpm
223223

224224
logstash_source_url:
225225
type: string

‎components/elasticsearch/scripts/rotate_es_indices‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
curator --host localhost delete indices --timestring '%Y.%m.%d' --older-than {{ ctx.node.properties.es_index_rotation_interval }} --time-unit days
3+
/opt/es-curator/embedded/bin/curator --host localhost delete indices --timestring '%Y.%m.%d' --older-than {{ ctx.node.properties.es_index_rotation_interval }} --time-unit days
44
EXITVALUE=$?
55
if [ $EXITVALUE != 0 ]; then
66
/usr/bin/logger -t elasticsearch-curator "ALERT exited abnormally with [$EXITVALUE]"

‎components/restservice/scripts/create.py‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -107,28 +107,6 @@ def deploy_broker_configuration():
107107
'(broker_ssl_enabled is False).')
108108

109109

110-
def _configure_dbus(rest_venv):
111-
# link dbus-python-1.1.1-9.el7.x86_64 to the venv for `cfy status`
112-
# (module in pypi is very old)
113-
site_packages = 'lib64/python2.7/site-packages'
114-
dbus_relative_path = os.path.join(site_packages, 'dbus')
115-
dbuslib = os.path.join('/usr', dbus_relative_path)
116-
dbus_glib_bindings = os.path.join('/usr', site_packages,
117-
'_dbus_glib_bindings.so')
118-
dbus_bindings = os.path.join('/usr', site_packages, '_dbus_bindings.so')
119-
if os.path.isdir(dbuslib):
120-
dbus_venv_path = os.path.join(rest_venv, dbus_relative_path)
121-
if not os.path.islink(dbus_venv_path):
122-
utils.ln(source=dbuslib, target=dbus_venv_path, params='-sf')
123-
utils.ln(source=dbus_bindings, target=dbus_venv_path, params='-sf')
124-
if not os.path.islink(os.path.join(rest_venv, site_packages)):
125-
utils.ln(source=dbus_glib_bindings, target=os.path.join(
126-
rest_venv, site_packages), params='-sf')
127-
else:
128-
ctx.logger.warn(
129-
'Could not find dbus install, cfy status will not work')
130-
131-
132110
def install_restservice():
133111

134112
rest_service_rpm_source_url = \
@@ -156,7 +134,6 @@ def install_restservice():
156134
deploy_broker_configuration()
157135
utils.yum_install(rest_service_rpm_source_url,
158136
service_name=REST_SERVICE_NAME)
159-
_configure_dbus(rest_venv)
160137
install_optional(rest_venv)
161138
utils.logrotate(REST_SERVICE_NAME)
162139

‎openstack-manager-blueprint.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -209,15 +209,15 @@ inputs:
209209
#############################
210210
rest_service_rpm_source_url:
211211
type: string
212-
default: cloudify-rest-service-3.4.0-m5_b394.x86_64.rpm
212+
default: cloudify-rest-service-3.4.0~m5-394.el7.x86_64.rpm
213213

214-
management_worker_rpm_source_url:
214+
amqpinflux_rpm_source_url:
215215
type: string
216-
default: cloudify-management-worker-3.4.0-m5_b394.x86_64.rpm
216+
default: cloudify-amqp-influxdb-3.4.0~m5-394.el7.x86_64.rpm
217217

218-
amqpinflux_rpm_source_url:
218+
management_worker_rpm_source_url:
219219
type: string
220-
default: cloudify-amqp-influx-3.4.0-m5_b394.x86_64.rpm
220+
default: cloudify-mgmt-worker-3.4.0~m5-394.el7.x86_64.rpm
221221

222222
cloudify_resources_url:
223223
type: string
@@ -257,7 +257,7 @@ inputs:
257257

258258
elasticsearch_curator_rpm_source_url:
259259
type: string
260-
default: elasticsearch-curator-3.2.3-1.x86_64.rpm
260+
default: elasticsearch-curator-3.2.3-2.el7.x86_64.rpm
261261

262262
logstash_source_url:
263263
type: string

‎simple-manager-blueprint.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,15 +120,15 @@ inputs:
120120
#############################
121121
rest_service_rpm_source_url:
122122
type: string
123-
default: cloudify-rest-service-3.4.0-m5_b394.x86_64.rpm
123+
default: cloudify-rest-service-3.4.0~m5-394.el7.x86_64.rpm
124124

125-
management_worker_rpm_source_url:
125+
amqpinflux_rpm_source_url:
126126
type: string
127-
default: cloudify-management-worker-3.4.0-m5_b394.x86_64.rpm
127+
default: cloudify-amqp-influxdb-3.4.0~m5-394.el7.x86_64.rpm
128128

129-
amqpinflux_rpm_source_url:
129+
management_worker_rpm_source_url:
130130
type: string
131-
default: cloudify-amqp-influx-3.4.0-m5_b394.x86_64.rpm
131+
default: cloudify-mgmt-worker-3.4.0~m5-394.el7.x86_64.rpm
132132

133133
cloudify_resources_url:
134134
type: string
@@ -168,7 +168,7 @@ inputs:
168168

169169
elasticsearch_curator_rpm_source_url:
170170
type: string
171-
default: elasticsearch-curator-3.2.3-1.x86_64.rpm
171+
default: elasticsearch-curator-3.2.3-2.el7.x86_64.rpm
172172

173173
logstash_source_url:
174174
type: string

‎vcloud-manager-blueprint.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -287,15 +287,15 @@ inputs:
287287
#############################
288288
rest_service_rpm_source_url:
289289
type: string
290-
default: cloudify-rest-service-3.4.0-m5_b394.x86_64.rpm
290+
default: cloudify-rest-service-3.4.0~m5-394.el7.x86_64.rpm
291291

292-
management_worker_rpm_source_url:
292+
amqpinflux_rpm_source_url:
293293
type: string
294-
default: cloudify-management-worker-3.4.0-m5_b394.x86_64.rpm
294+
default: cloudify-amqp-influxdb-3.4.0~m5-394.el7.x86_64.rpm
295295

296-
amqpinflux_rpm_source_url:
296+
management_worker_rpm_source_url:
297297
type: string
298-
default: cloudify-amqp-influx-3.4.0-m5_b394.x86_64.rpm
298+
default: cloudify-mgmt-worker-3.4.0~m5-394.el7.x86_64.rpm
299299

300300
cloudify_resources_url:
301301
type: string
@@ -335,7 +335,7 @@ inputs:
335335

336336
elasticsearch_curator_rpm_source_url:
337337
type: string
338-
default: elasticsearch-curator-3.2.3-1.x86_64.rpm
338+
default: elasticsearch-curator-3.2.3-2.el7.x86_64.rpm
339339

340340
logstash_source_url:
341341
type: string

‎vsphere-manager-blueprint.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -294,15 +294,15 @@ inputs:
294294
#############################
295295
rest_service_rpm_source_url:
296296
type: string
297-
default: cloudify-rest-service-3.4.0-m5_b394.x86_64.rpm
297+
default: cloudify-rest-service-3.4.0~m5-394.el7.x86_64.rpm
298298

299-
management_worker_rpm_source_url:
299+
amqpinflux_rpm_source_url:
300300
type: string
301-
default: cloudify-management-worker-3.4.0-m5_b394.x86_64.rpm
301+
default: cloudify-amqp-influxdb-3.4.0~m5-394.el7.x86_64.rpm
302302

303-
amqpinflux_rpm_source_url:
303+
management_worker_rpm_source_url:
304304
type: string
305-
default: cloudify-amqp-influx-3.4.0-m5_b394.x86_64.rpm
305+
default: cloudify-mgmt-worker-3.4.0~m5-394.el7.x86_64.rpm
306306

307307
cloudify_resources_url:
308308
type: string
@@ -342,7 +342,7 @@ inputs:
342342

343343
elasticsearch_curator_rpm_source_url:
344344
type: string
345-
default: elasticsearch-curator-3.2.3-1.x86_64.rpm
345+
default: elasticsearch-curator-3.2.3-2.el7.x86_64.rpm
346346

347347
logstash_source_url:
348348
type: string

0 commit comments

Comments
 (0)