From df4eb862341e8e7497e0f540d7c223c8d0fa56d1 Mon Sep 17 00:00:00 2001 From: Joe Gordon Date: Wed, 9 Oct 2013 12:37:49 -0700 Subject: [PATCH] Remove xenapi rpm building code Nova shouldn't be building any types of packages. And if we are we should be testing this code in gate somewhere. Change-Id: I70d82a6173b5eda183d4e49d330ae97dd14f9078 --- plugins/xenserver/xenapi/README | 8 ---- plugins/xenserver/xenapi/contrib/build-rpm.sh | 22 --------- .../rpmbuild/SPECS/openstack-xen-plugins.spec | 45 ------------------- 3 files changed, 75 deletions(-) delete mode 100755 plugins/xenserver/xenapi/contrib/build-rpm.sh delete mode 100644 plugins/xenserver/xenapi/contrib/rpmbuild/SPECS/openstack-xen-plugins.spec diff --git a/plugins/xenserver/xenapi/README b/plugins/xenserver/xenapi/README index 710cc56892ed..63d1bb7189ea 100644 --- a/plugins/xenserver/xenapi/README +++ b/plugins/xenserver/xenapi/README @@ -6,11 +6,3 @@ added files are executable. You can do this by running the following command (from dom0): chmod a+x /etc/xapi.d/plugins/* - -Otherwise, you can build an rpm as detailed in: - -$NOVA_ROOT/plugins/xenserver/xenapi/contrib/ - -and install the rpm by running the following command (from dom0): - -rpm -i openstack-xen-plugins.rpm diff --git a/plugins/xenserver/xenapi/contrib/build-rpm.sh b/plugins/xenserver/xenapi/contrib/build-rpm.sh deleted file mode 100755 index 016dc750eded..000000000000 --- a/plugins/xenserver/xenapi/contrib/build-rpm.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -PACKAGE=openstack-xen-plugins -THIS_DIR=$(cd $(dirname $0) && pwd) -RPMBUILD_DIR="$THIS_DIR/rpmbuild" - -if [ ! -d $RPMBUILD_DIR ]; then - echo $RPMBUILD_DIR is missing - exit 1 -fi - -for dir in BUILD BUILDROOT SRPMS RPMS SOURCES; do - rm -rf $RPMBUILD_DIR/$dir - mkdir -p $RPMBUILD_DIR/$dir -done - -rm -rf /tmp/$PACKAGE -mkdir /tmp/$PACKAGE -cp -r "$THIS_DIR/../etc/xapi.d" /tmp/$PACKAGE -tar czf $RPMBUILD_DIR/SOURCES/$PACKAGE.tar.gz -C /tmp $PACKAGE - -rpmbuild -ba --nodeps --define "_topdir $RPMBUILD_DIR" \ - $RPMBUILD_DIR/SPECS/$PACKAGE.spec diff --git a/plugins/xenserver/xenapi/contrib/rpmbuild/SPECS/openstack-xen-plugins.spec b/plugins/xenserver/xenapi/contrib/rpmbuild/SPECS/openstack-xen-plugins.spec deleted file mode 100644 index 10b3b127e2e9..000000000000 --- a/plugins/xenserver/xenapi/contrib/rpmbuild/SPECS/openstack-xen-plugins.spec +++ /dev/null @@ -1,45 +0,0 @@ -Name: openstack-xen-plugins -Version: 2012.1 -Release: 1 -Summary: Files for XenAPI support. -License: ASL 2.0 -Group: Applications/Utilities -Source0: openstack-xen-plugins.tar.gz -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -%define debug_package %{nil} - -%description -This package contains files that are required for XenAPI support for OpenStack. - -%prep -%setup -q -n openstack-xen-plugins - -%install -rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/etc -cp -r xapi.d $RPM_BUILD_ROOT/etc -chmod a+x $RPM_BUILD_ROOT/etc/xapi.d/plugins/* - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(-,root,root,-) -/etc/xapi.d/plugins/_bittorrent_seeder -/etc/xapi.d/plugins/agent -/etc/xapi.d/plugins/bandwidth -/etc/xapi.d/plugins/bittorrent -/etc/xapi.d/plugins/config_file -/etc/xapi.d/plugins/console -/etc/xapi.d/plugins/glance -/etc/xapi.d/plugins/ipxe -/etc/xapi.d/plugins/kernel -/etc/xapi.d/plugins/migration -/etc/xapi.d/plugins/pluginlib_nova.py -/etc/xapi.d/plugins/workarounds -/etc/xapi.d/plugins/xenhost -/etc/xapi.d/plugins/xenstore.py -/etc/xapi.d/plugins/utils.py -/etc/xapi.d/plugins/nova_plugin_version