diff --git a/.gitignore b/.gitignore deleted file mode 100644 index a17356a..0000000 --- a/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/.build-* -/noarch -/openstack-marconi-*.src.rpm -/marconi-2014.1.tar.gz -/marconi-2014.1 diff --git a/0001-Remove-runtime-dependency-on-PBR.patch b/0001-Remove-runtime-dependency-on-PBR.patch deleted file mode 100644 index 1ef743b..0000000 --- a/0001-Remove-runtime-dependency-on-PBR.patch +++ /dev/null @@ -1,52 +0,0 @@ -From d399e9886d3edd9a8030ba903236d774179c9571 Mon Sep 17 00:00:00 2001 -From: Jon Bernard -Date: Tue, 22 Apr 2014 13:16:29 -0400 -Subject: [PATCH] Remove runtime dependency on PBR - ---- - marconi/version.py | 27 ++++++++++++++++++++++++--- - 1 file changed, 24 insertions(+), 3 deletions(-) - -diff --git a/marconi/version.py b/marconi/version.py -index a3acf95..af59049 100644 ---- a/marconi/version.py -+++ b/marconi/version.py -@@ -13,11 +13,32 @@ - # See the License for the specific language governing permissions and - # limitations under the License. - --import pbr.packaging --import pbr.version -+MARCONI_VENDOR = "OpenStack Foundation" -+MARCONI_PRODUCT = "OpenStack Marconi" -+MARCONI_PACKAGE = None # OS distro package version suffix - - --version_info = pbr.version.VersionInfo('marconi') -+class VersionInfo(object): -+ release = "REDHATRELEASE" -+ version = "REDHATVERSION" -+ -+ def version_string(self): -+ return self.version -+ -+ def cached_version_string(self): -+ return self.version -+ -+ def release_string(self): -+ return self.release -+ -+ def canonical_version_string(self): -+ return self.version -+ -+ def version_string_with_vcs(self): -+ return self.release -+ -+ -+version_info = VersionInfo() - - - def verify_sha(expected): --- -1.9.1 - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..0dc0d33 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Renamed to openstack-zaqar diff --git a/marconi-dist.conf b/marconi-dist.conf deleted file mode 100644 index b50423a..0000000 --- a/marconi-dist.conf +++ /dev/null @@ -1,5 +0,0 @@ -[DEFAULT] -log_file = /var/log/marconi/marconi.log - -[drivers] -storage=sqlite diff --git a/openstack-marconi.logrotate b/openstack-marconi.logrotate deleted file mode 100644 index 2a914a0..0000000 --- a/openstack-marconi.logrotate +++ /dev/null @@ -1,7 +0,0 @@ -/var/log/marconi/*.log { - weekly - rotate 4 - missingok - compress - minsize 100k -} diff --git a/openstack-marconi.service b/openstack-marconi.service deleted file mode 100644 index 7b9906b..0000000 --- a/openstack-marconi.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=OpenStack Message Queuing Service (code-named Marconi) server -After=syslog.target network.target - -[Service] -Type=simple -User=marconi -ExecStart=/usr/bin/marconi-server -PrivateTmp=true - -[Install] -WantedBy=multi-user.target diff --git a/openstack-marconi.spec b/openstack-marconi.spec deleted file mode 100644 index b93a586..0000000 --- a/openstack-marconi.spec +++ /dev/null @@ -1,171 +0,0 @@ -%define project marconi - -Name: openstack-%{project} -Version: 2014.1 -Release: 4%{?dist}.2 -Summary: OpenStack Message Queuing Service (%{project}) - -Group: Applications/System -License: ASL 2.0 -URL: https://wiki.openstack.org/wiki/Marconi -Source0: https://launchpad.net/%{project}/icehouse/%{version}/+download/%{project}-%{version}.tar.gz - -Source1: %{project}-dist.conf - -Source10: %{name}.service -Source11: %{name}.logrotate - -# -# patches_base=2014.1 -# -Patch0001: 0001-Remove-runtime-dependency-on-PBR.patch - -BuildArch: noarch - -BuildRequires: python2-devel -BuildRequires: systemd -BuildRequires: python-setuptools -BuildRequires: python-pbr -BuildRequires: openstack-utils - -Requires(pre): shadow-utils -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd - -Requires: python-six -Requires: python-stevedore -Requires: python-jsonschema -Requires: python-oslo-config -Requires: python-falcon -Requires: python-pymongo -Requires: python-sqlite3dbm -Requires: python-memcached -Requires: python-babel -Requires: python-bson -Requires: python-sqlalchemy -Requires: python-keystoneclient -Requires: python-netaddr -Requires: python-iso8601 -Requires: python-msgpack -Requires: python-webob -Requires: python-posix_ipc - -%description -Marconi is a messaging and notifications service for the OpenStack product -portfolio, supporting point-to-point, producer-consumer, publisher-subscriber -models. Marconi is designed to perform and scale in a multi-tenant environment. - -%prep -%setup -q -n %{project}-%{version} - -%patch0001 -p1 - -sed -i 's/REDHATVERSION/%{version}/; s/REDHATRELEASE/%{release}/' %{project}/version.py - -# Remove the requirements file so that pbr hooks don't add it -# to distutils requires_dist config -rm -rf {test-,}requirements.txt - -%build -%{__python2} setup.py build - -# Programmatically update defaults in sample configs - -# First we ensure all values are commented in appropriate format. -# Since icehouse, there was an uncommented keystone_authtoken section -# at the end of the file which mimics but also conflicted with our -# distro editing that had been done for many releases. -sed -i '/^[^#[]/{s/^/#/; s/ //g}; /^#[^ ]/s/ = /=/' etc/%{project}.conf.sample etc/logging.conf.sample - -# TODO: Make this more robust -# Note it only edits the first occurance, so assumes a section ordering in sample -# and also doesn't support multi-valued variables like dhcpbridge_flagfile. -while read name eq value; do - test "$name" && test "$value" || continue - sed -i "0,/^# *$name=/{s!^# *$name=.*!#$name=$value!}" etc/%{project}.conf.sample -done < %{SOURCE1} - -%install -%{__python2} setup.py install -O1 --skip-build --root %{buildroot} - -# Setup directories -install -d -m 755 %{buildroot}%{_unitdir} -install -d -m 755 %{buildroot}%{_datadir}/%{project} -install -d -m 755 %{buildroot}%{_sharedstatedir}/%{project} -install -d -m 755 %{buildroot}%{_localstatedir}/log/%{project} - -# Install config files -install -p -D -m 644 %{SOURCE1} %{buildroot}%{_datadir}/%{project}/%{project}-dist.conf -install -d -m 755 %{buildroot}%{_sysconfdir}/%{project} - -install -p -D -m 640 etc/%{project}.conf.sample %{buildroot}%{_sysconfdir}/%{project}/%{project}.conf -install -p -D -m 640 etc/logging.conf.sample %{buildroot}%{_sysconfdir}/%{project}/logging.conf - -# Install logrotate -install -p -D -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} - -# Install initscripts -install -p -m 644 %{SOURCE10} %{buildroot}%{_unitdir} - -%pre -USERNAME=%{project} -GROUPNAME=$USERNAME -HOMEDIR=%{_sharedstatedir}/$USERNAME -getent group $GROUPNAME >/dev/null || groupadd -r $GROUPNAME -getent passwd $USERNAME >/dev/null || \ - useradd -r -g $GROUPNAME -G $GROUPNAME -d $HOMEDIR -s /sbin/nologin \ - -c "OpenStack Marconi Daemon" $USERNAME -exit 0 - -%post -%systemd_post openstack-marconi.service - -%preun -%systemd_preun openstack-marconi.service - -%postun -%systemd_postun_with_restart openstack-marconi.service - -%files -%doc LICENSE README.rst - -%dir %{_sysconfdir}/%{project} -%config(noreplace) %attr(0640, root, %{project}) %{_sysconfdir}/%{project}/%{project}.conf -%config(noreplace) %attr(0640, root, %{project}) %{_sysconfdir}/%{project}/logging.conf -%config(noreplace) %{_sysconfdir}/logrotate.d/%{name} - -%dir %attr(0755, %{project}, root) %{_localstatedir}/log/%{project} - -%{_bindir}/%{project}-server - -%{_datarootdir}/%{project} - -%defattr(-, %{project}, %{project}, -) -%dir %{_sharedstatedir}/%{project} - -%defattr(-,root,root,-) -%{_unitdir}/%{name}.service -%{python_sitelib}/%{project} -%{python_sitelib}/%{project}-%{version}*.egg-info - -%changelog -* Thu Feb 04 2016 Fedora Release Engineering - 2014.1-4.2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Thu Jun 18 2015 Fedora Release Engineering - 2014.1-3.2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 2014.1-2.2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue Apr 29 2014 Jon Bernard - 2014.1-2 -- Added dist config file overrides -- Various cleanups - -* Tue Apr 22 2014 Jon Bernard - 2014.1-1.1 -- Add missing runtime dependency on python-posix_ipc -- Remove runtime dependency on PBR - -* Thu Apr 17 2014 Jon Bernard - 2014.1-1 -- Initial package diff --git a/sources b/sources deleted file mode 100644 index 2e33c9c..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -c2841188579286b4db84fa5fb0d703be marconi-2014.1.tar.gz