Embedded Python packages

aws-ec2-manager-blueprint.yaml

@@ -121,7 +121,7 @@ inputs:
       Set this to true if you want Telecom Edition
     type: boolean
     default: false
-    
+
 dsl_definitions:
   aws_configuration: &aws_configuration
     aws_access_key_id: { get_input: aws_access_key_id }

components/elasticsearch/scripts/rotate_es_indices

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-curator --host localhost delete indices --timestring '%Y.%m.%d' --older-than {{ ctx.node.properties.es_index_rotation_interval }} --time-unit days
+/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
 EXITVALUE=$?
 if [ $EXITVALUE != 0 ]; then
     /usr/bin/logger -t elasticsearch-curator "ALERT exited abnormally with [$EXITVALUE]"

components/restservice/scripts/create.py

@@ -112,28 +112,6 @@ def deploy_broker_configuration():
                             '(broker_ssl_enabled is False).')
 
 
-def _configure_dbus(rest_venv):
-    # link dbus-python-1.1.1-9.el7.x86_64 to the venv for `cfy status`
-    # (module in pypi is very old)
-    site_packages = 'lib64/python2.7/site-packages'
-    dbus_relative_path = os.path.join(site_packages, 'dbus')
-    dbuslib = os.path.join('/usr', dbus_relative_path)
-    dbus_glib_bindings = os.path.join('/usr', site_packages,
-                                      '_dbus_glib_bindings.so')
-    dbus_bindings = os.path.join('/usr', site_packages, '_dbus_bindings.so')
-    if os.path.isdir(dbuslib):
-        dbus_venv_path = os.path.join(rest_venv, dbus_relative_path)
-        if not os.path.islink(dbus_venv_path):
-            utils.ln(source=dbuslib, target=dbus_venv_path, params='-sf')
-            utils.ln(source=dbus_bindings, target=dbus_venv_path, params='-sf')
-        if not os.path.islink(os.path.join(rest_venv, site_packages)):
-            utils.ln(source=dbus_glib_bindings, target=os.path.join(
-                    rest_venv, site_packages), params='-sf')
-    else:
-        ctx.logger.warn(
-                'Could not find dbus install, cfy status will not work')
-
-
 def install_restservice():
 
     rest_service_rpm_source_url = \
@@ -161,7 +139,6 @@ def install_restservice():
     deploy_broker_configuration()
     utils.yum_install(rest_service_rpm_source_url,
                       service_name=REST_SERVICE_NAME)
-    _configure_dbus(rest_venv)
     install_optional(rest_venv)
     utils.logrotate(REST_SERVICE_NAME)
 

openstack-manager-blueprint.yaml

@@ -156,7 +156,7 @@ inputs:
       Set this to true if you want Telecom Edition
     type: boolean
     default: false
-    
+
 dsl_definitions:
   openstack_configuration: &openstack_configuration
     username: { get_input: keystone_username }