Skip to content

Commit

Permalink
Remove pool-manager and zone-manager subpackages
Browse files Browse the repository at this point in the history
They were deprecated some releases ago and have been finally removed in
train [1].

Also added designate-api-wsgi binary included in [2]

[1] https://review.opendev.org/#/c/665476
[2] https://review.opendev.org/#/c/679699

Change-Id: I5fe8b1cb8a844095860868f5a3b95d7b25352785
  • Loading branch information
amoralej committed Oct 11, 2019
1 parent 75204ad commit 634042c
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 90 deletions.
14 changes: 0 additions & 14 deletions designate-pool-manager.service

This file was deleted.

14 changes: 0 additions & 14 deletions designate-zone-manager.service

This file was deleted.

65 changes: 3 additions & 62 deletions openstack-designate.spec
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@ Source10: designate-agent.service
Source11: designate-api.service
Source12: designate-central.service
Source13: designate-mdns.service
Source14: designate-pool-manager.service
Source15: designate-sink.service
Source16: designate-zone-manager.service
Source17: designate-producer.service
Source18: designate-worker.service

Expand Down Expand Up @@ -237,6 +235,8 @@ This package contains OpenStack Designate Mini DNS service.
%package producer
Summary: OpenStack Designate Producer service
Group: Applications/System
Obsoletes: openstack-designate-pool-manager < 9.0.0
Obsoletes: openstack-designate-zone-manager < 9.0.0

Requires: openstack-%{service}-common = %{epoch}:%{version}-%{release}

Expand All @@ -247,19 +247,6 @@ Requires: openstack-%{service}-common = %{epoch}:%{version}-%{release}
This package contains OpenStack Designate Producer service.


%package pool-manager
Summary: OpenStack Designate Pool Manager service
Group: Applications/System

Requires: openstack-%{service}-common = %{epoch}:%{version}-%{release}


%description pool-manager
%{common_desc}

This package contains OpenStack Designate Pool Manager service.


%package sink
Summary: OpenStack Designate Sink service
Group: Applications/System
Expand All @@ -286,19 +273,6 @@ Requires: openstack-%{service}-common = %{epoch}:%{version}-%{release}
This package contains OpenStack Designate Worker service.


%package zone-manager
Summary: OpenStack Designate Zone Manager service
Group: Applications/System

Requires: openstack-%{service}-common = %{epoch}:%{version}-%{release}


%description zone-manager
%{common_desc}

This package contains OpenStack Designate Zone Manager service.


%prep
%setup -q -n %{service}-%{upstream_version}

Expand Down Expand Up @@ -343,9 +317,7 @@ install -p -D -m 644 %{SOURCE10} %{buildroot}%{_unitdir}/designate-agent.service
install -p -D -m 644 %{SOURCE11} %{buildroot}%{_unitdir}/designate-api.service
install -p -D -m 644 %{SOURCE12} %{buildroot}%{_unitdir}/designate-central.service
install -p -D -m 644 %{SOURCE13} %{buildroot}%{_unitdir}/designate-mdns.service
install -p -D -m 644 %{SOURCE14} %{buildroot}%{_unitdir}/designate-pool-manager.service
install -p -D -m 644 %{SOURCE15} %{buildroot}%{_unitdir}/designate-sink.service
install -p -D -m 644 %{SOURCE16} %{buildroot}%{_unitdir}/designate-zone-manager.service
install -p -D -m 644 %{SOURCE17} %{buildroot}%{_unitdir}/designate-producer.service
install -p -D -m 644 %{SOURCE18} %{buildroot}%{_unitdir}/designate-worker.service

Expand Down Expand Up @@ -423,18 +395,6 @@ exit 0
%systemd_postun_with_restart designate-producer.service


%post pool-manager
%systemd_post designate-pool-manager.service


%preun pool-manager
%systemd_preun designate-pool-manager.service


%postun pool-manager
%systemd_postun_with_restart designate-pool-manager.service


%post sink
%systemd_post designate-sink.service

Expand All @@ -459,14 +419,6 @@ exit 0
%systemd_postun_with_restart designate-worker.service


%preun zone-manager
%systemd_preun designate-zone-manager.service


%postun zone-manager
%systemd_postun_with_restart designate-zone-manager.service


%files -n python%{pyver}-%{service}-tests
%license LICENSE
%{pyver_sitelib}/%{service}/tests
Expand Down Expand Up @@ -496,6 +448,7 @@ exit 0
%{_bindir}/designate-rootwrap
%{_bindir}/designate-manage
%{_bindir}/designate-status
%{_bindir}/designate-api-wsgi


%files agent
Expand Down Expand Up @@ -529,12 +482,6 @@ exit 0
%{_unitdir}/designate-producer.service


%files pool-manager
%license LICENSE
%{_bindir}/designate-pool-manager
%{_unitdir}/designate-pool-manager.service


%files sink
%license LICENSE
%{_bindir}/designate-sink
Expand All @@ -547,10 +494,4 @@ exit 0
%{_unitdir}/designate-worker.service


%files zone-manager
%license LICENSE
%{_bindir}/designate-zone-manager
%{_unitdir}/designate-zone-manager.service


%changelog

0 comments on commit 634042c

Please sign in to comment.