From e6334fdc0c4d21171c46399f5a621d7edad755a2 Mon Sep 17 00:00:00 2001 From: Vladimir Kozhukalov Date: Fri, 10 Jul 2015 18:33:07 +0300 Subject: [PATCH] Removed fuel-agent package from nailgun.spec Fuel Agent is to be moved into a separate git repository. So, this spec is going to be there and will be checked out during ISO building together with source Fuel Agent code. Change-Id: I483ebabc6147d3f9459672d61ebfa94dc446516c Implements: bp split-fuel-web-repo --- specs/nailgun.spec | 63 ---------------------------------------------- 1 file changed, 63 deletions(-) diff --git a/specs/nailgun.spec b/specs/nailgun.spec index bd99d9b96a..f737efc054 100644 --- a/specs/nailgun.spec +++ b/specs/nailgun.spec @@ -73,7 +73,6 @@ cd %{_builddir}/%{name}-%{version}/nailgun && python setup.py build cd %{_builddir}/%{name}-%{version}/network_checker && python setup.py build cd %{_builddir}/%{name}-%{version}/shotgun && python setup.py build cd %{_builddir}/%{name}-%{version}/fuelmenu && python setup.py build -cd %{_builddir}/%{name}-%{version}/fuel_agent && python setup.py build cd %{_builddir}/%{name}-%{version}/fuel_upgrade_system/fuel_package_updates && python setup.py build %install @@ -81,7 +80,6 @@ cd %{_builddir}/%{name}-%{version}/nailgun && python setup.py install --single-v cd %{_builddir}/%{name}-%{version}/network_checker && python setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=%{_builddir}/%{name}-%{version}/network_checker/INSTALLED_FILES cd %{_builddir}/%{name}-%{version}/shotgun && python setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=%{_builddir}/%{name}-%{version}/shotgun/INSTALLED_FILES cd %{_builddir}/%{name}-%{version}/fuelmenu && python setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=%{_builddir}/%{name}-%{version}/fuelmenu/INSTALLED_FILES -cd %{_builddir}/%{name}-%{version}/fuel_agent && python setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=%{_builddir}/%{name}-%{version}/fuel_agent/INSTALLED_FILES cd %{_builddir}/%{name}-%{version}/fuel_upgrade_system/fuel_package_updates && python setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=%{_builddir}/%{name}-%{version}/fuel_upgrade_system/fuel_package_updates/INSTALLED_FILES mkdir -p %{buildroot}/opt/nailgun/bin mkdir -p %{buildroot}/etc/cron.d @@ -92,14 +90,8 @@ install -m 755 %{_builddir}/%{name}-%{version}/bin/agent %{buildroot}/opt/nailgu install -m 755 %{_builddir}/%{name}-%{version}/bin/fencing-agent.rb %{buildroot}/opt/nailgun/bin/fencing-agent.rb install -m 644 %{_builddir}/%{name}-%{version}/bin/nailgun-agent.cron %{buildroot}/etc/cron.d/nailgun-agent install -m 644 %{_builddir}/%{name}-%{version}/bin/fencing-agent.cron %{buildroot}/etc/cron.d/fencing-agent -install -d -m 755 %{buildroot}%{_sysconfdir}/fuel-agent -install -p -D -m 644 %{_builddir}/%{name}-%{version}/fuel_agent/etc/fuel-agent/fuel-agent.conf.sample %{buildroot}%{_sysconfdir}/fuel-agent/fuel-agent.conf install -p -D -m 755 %{_builddir}/%{name}-%{version}/bin/download-debian-installer %{buildroot}%{_bindir}/download-debian-installer -# Install template file -install -d -m 755 %{buildroot}%{_datadir}/fuel-agent/cloud-init-templates -install -p -D -m 644 %{_builddir}/%{name}-%{version}/fuel_agent/cloud-init-templates/* %{buildroot}%{_datadir}/fuel-agent/cloud-init-templates - %clean rm -rf $RPM_BUILD_ROOT @@ -216,61 +208,6 @@ Summary: Console utility for pre-configuration of Fuel server %config(noreplace) /etc/fuel/astute.yaml -%package -n fuel-agent - -Summary: Fuel-agent package -Version: %{version} -Release: %{release} -URL: http://mirantis.com -License: Apache -Group: Development/Libraries -BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot -Prefix: %{_prefix} -BuildRequires: python-setuptools -BuildRequires: python-pbr -BuildArch: noarch - -Requires: python -Requires: python-babel -Requires: python-eventlet -Requires: python-jsonschema -Requires: python-oslo-config -Requires: python-oslo-serialization >= 1.0.0 -Requires: python-iso8601 -Requires: python-six -Requires: python-stevedore -Requires: python-jinja2 -Requires: python-requests -Requires: python-urllib3 -Requires: PyYAML -Requires: python-argparse -Requires: python-pbr -Requires: tar -Requires: gzip -Requires: bzip2 -Requires: openssh-clients -Requires: mdadm -Requires: util-linux-ng -Requires: udev -Requires: lvm2 -Requires: dmidecode -Requires: parted -Requires: cloud-utils -Requires: e2fsprogs -Requires: gdisk -Requires: genisoimage -Requires: xfsprogs -Requires: pciutils -Requires: ethtool - -%description -n fuel-agent -Fuel-agent package - -%files -n fuel-agent -f %{_builddir}/%{name}-%{version}/fuel_agent/INSTALLED_FILES -%defattr(-,root,root) -%config(noreplace) %{_sysconfdir}/fuel-agent/fuel-agent.conf -%{_datadir}/fuel-agent/cloud-init-templates/* - %package -n fencing-agent Summary: Fencing agent Version: %{version}