From ac9cf9560921a85c8f8331dd3f628f4033abab8a Mon Sep 17 00:00:00 2001 From: Vladimir Kozhukalov Date: Mon, 17 Aug 2015 18:11:33 +0300 Subject: [PATCH] Separate package for openstack.yaml We need this file to be available in a separate package because upgrade script needs some information from this file. fuel-upgrade package is to depend on this package. Change-Id: I02f32386232c94a0288877dfc78513a8bc74d23e Closes-Bug: #1485663 Implements: bp package-master-node-upgrade --- specs/nailgun.spec | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/specs/nailgun.spec b/specs/nailgun.spec index fc34a0aa11..a1ea7b8594 100644 --- a/specs/nailgun.spec +++ b/specs/nailgun.spec @@ -12,6 +12,7 @@ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot Prefix: %{_prefix} BuildRequires: python-setuptools +BuildRequires: python-yaml BuildRequires: git BuildRequires: nodejs BuildArch: noarch @@ -143,7 +144,8 @@ install -m 600 %{_builddir}/%{name}-%{version}/fuelmenu/fuelmenu/settings.yaml % install -m 755 %{_builddir}/%{name}-%{version}/bin/fencing-agent.rb %{buildroot}/opt/nailgun/bin/fencing-agent.rb install -m 644 %{_builddir}/%{name}-%{version}/bin/fencing-agent.cron %{buildroot}/etc/cron.d/fencing-agent install -p -D -m 755 %{_builddir}/%{name}-%{version}/bin/download-debian-installer %{buildroot}%{_bindir}/download-debian-installer - +install -p -D -m 644 %{_builddir}/%{name}-%{version}/nailgun/nailgun/fixtures/openstack.yaml %{buildroot}%{_datadir}/fuel-openstack-metadata/openstack.yaml +python -c "import yaml; print filter(lambda r: r['fields'].get('name'), yaml.safe_load(open('%{_builddir}/%{name}-%{version}/nailgun/nailgun/fixtures/openstack.yaml')))[0]['fields']['version']" > %{buildroot}%{_sysconfdir}/fuel_openstack_version %clean rm -rf $RPM_BUILD_ROOT @@ -151,6 +153,23 @@ rm -rf $RPM_BUILD_ROOT %files -f %{_builddir}/%{name}-%{version}/nailgun/INSTALLED_FILES %defattr(0755,root,root) +%package -n fuel-openstack-metadata + +Summary: Fuel Openstack metadata files +Version: %{version} +Release: %{release} +License: GPLv2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +URL: http://github.com/Mirantis + +%description -n fuel-openstack-metadata +This package currently installs just a single file openstack.yaml + +%files -n fuel-openstack-metadata +%defattr(-,root,root) +%{_datadir}/fuel-openstack-metadata/* +%{_sysconfdir}/fuel_openstack_version + %package -n nailgun-net-check Summary: Network checking package for CentOS6.x