Resolve merge conflicts

GNUmakefile

@@ -30,7 +30,7 @@ egg:
 build:
 # Now build all the build dependencies for this zenpack.
  rm -rf $(TXSSHCLIENT_DIR)/build
- cd $(TXSSHCLIENT_DIR); python setup.py build
+ cd $(TXSSHCLIENT_DIR); python setup.py build --build-lib build/lib
  mkdir -p $(ZP_DIR)/lib/sshclient
  cp -r $(TXSSHCLIENT_DIR)/build/lib/sshclient/* $(ZP_DIR)/lib/sshclient/
 

ZenPacks/zenoss/OpenStackInfrastructure/__init__.py

@@ -31,7 +31,7 @@
 from OFS.CopySupport import CopyError
 
 schema = CFG.zenpack_module.schema
-from service_migration import install_migrate_zenpython, remove_migrate_zenpython, fix_service_healthcheck_path, force_update_configs
+from service_migration import remove_migrate_zenpython, force_update_configs
 
 NOVAHOST_PLUGINS = ['zenoss.cmd.linux.openstack.nova',
  'zenoss.cmd.linux.openstack.libvirt',
@@ -54,18 +54,12 @@ def install(self, app):
  self._migrate_productversions()
  self._update_plugins('/Server/SSH/Linux/NovaHost')
  super(ZenPack, self).install(app)
- install_migrate_zenpython()
  if VERSION5:
  # by default, services are only installed during initial zenpack
  # installs, not upgrades. We run it every time instead, but make
  # it only process service definitions that are missing, by
  # overriding getServiceDefinitionFiles to be intelligent.
  self.installServices()
-
- # Fix zenpack-provided healthcheck file paths (since the zenpack's)
- # directory may change during install/upgrade
- fix_service_healthcheck_path()
-
  # We ship a shell script as a "config" file- make sure that
  # the config is updated if the script has changed.
  force_update_configs(self, "proxy-zenopenstack", ["opt/zenoss/bin/proxy-zenopenstack"])
@@ -83,8 +77,6 @@ def getServiceDefinitionFiles(self):
 
  svcs = set([s.name for s in ctx.services])
  files = []
- if "RabbitMQ-Ceilometer" not in svcs:
- files.append(self.path('service_definition', "RabbitMQ-Ceilometer.json"))
  if "zenopenstack" not in svcs:
  files.append(self.path('service_definition', "zenopenstack.json"))
  if "proxy-zenopenstack" not in svcs:
@@ -130,8 +122,6 @@ def remove(self, app, leaveObjects=False):
  finally:
  ZenPack.UNINSTALLING = False
 
- remove_migrate_zenpython()
-
 
 # Patch last to avoid import recursion problems.
 from ZenPacks.zenoss.OpenStackInfrastructure import patches

ZenPacks/zenoss/OpenStackInfrastructure/configure.zcml

@@ -38,12 +38,6 @@
  factory=".datasources.PerfAMQPDataSource.PerfAMQPDataSourceInfo"
  />
 
- <adapter
- provides=".datasources.EventsAMQPDataSource.IEventsAMQPDataSourceInfo"
- for=".datasources.EventsAMQPDataSource.EventsAMQPDataSource"
- factory=".datasources.EventsAMQPDataSource.EventsAMQPDataSourceInfo"
- />
-
  <adapter
  provides=".datasources.ApiEndpointStatusDataSource.IApiEndpointStatusDataSourceInfo"
  for=".datasources.ApiEndpointStatusDataSource.ApiEndpointStatusDataSource"