Cluster service optional native rpm package

rpm/eucalyptus.spec

@@ -242,8 +242,30 @@ the cloud clients.
 %package cc
 Summary:      Eucalyptus cloud platform - cluster controller
 
+Requires:     %{name} = %{version}-%{release}
+Requires:     %{name}-common-java = %{version}-%{release}
+Requires:     eucalyptus-selinux
+Requires:     rsync
+Requires:     /usr/bin/which
+
+Provides:     eucalyptus-cluster = %{version}-%{release}
+
+%description cc
+Eucalyptus is a service overlay that implements elastic computing
+using existing resources. The goal of Eucalyptus is to allow sites
+with existing clusters and server infrastructure to co-host an elastic
+computing service that is interface-compatible with Amazon AWS.
+
+This package contains the cluster controller part of eucalyptus. It
+handles a group of node controllers.
+
+
+%package cc-native
+Summary:      Eucalyptus cloud platform - native cluster controller
+
 Requires:     %{name} = %{version}-%{release}
 Requires:     %{name}-axis2c-common = %{version}-%{release}
+Requires:     %{name}-cc = %{version}-%{release}
 Requires:     bridge-utils
 Requires:     dhcp >= 4.1.1-33.P1
 Requires:     eucalyptus-selinux
@@ -254,20 +276,20 @@ Requires:     iputils
 Requires:     libselinux-python
 Requires:     python-argparse
 Requires:     rsync
-Requires:     vconfig
 Requires:     /usr/bin/which
 %{?systemd_requires}
 
 Provides:     eucalyptus-cluster = %{version}-%{release}
 
-%description cc
+%description cc-native
 Eucalyptus is a service overlay that implements elastic computing
 using existing resources. The goal of Eucalyptus is to allow sites
 with existing clusters and server infrastructure to co-host an elastic
 computing service that is interface-compatible with Amazon AWS.
 
-This package contains the cluster controller part of eucalyptus. It
-handles a group of node controllers.
+This package contains the native cluster controller service. It
+handles a group of node controllers as an alternative to the Java
+cluster controller.
 
 
 %package nc
@@ -548,15 +570,19 @@ cp -Rp admin-tools/conf/* $RPM_BUILD_ROOT/%{_sysconfdir}/eucalyptus-admin
 
 
 %files cc
+/usr/sbin/clusteradmin-*
+%{_unitdir}/eucalyptus-cc.service
+%{_unitdir}/eucalyptus-cluster.service
+
+
+%files cc-native
 %{axis2c_home}/services/EucalyptusCC/
 %attr(-,eucalyptus,eucalyptus) %dir /var/lib/eucalyptus/CC
 /usr/lib/eucalyptus/shutdownCC
-/usr/sbin/clusteradmin-*
 /usr/sbin/eucalyptus-cluster
 /usr/share/eucalyptus/dynserv.pl
-%{_unitdir}/eucalyptus-cc.service
-%{_unitdir}/eucalyptus-cluster.service
-
+%{_unitdir}/eucalyptus-cluster-native.service
+%{_unitdir}/eucalyptus-cloud.service.d/eucalyptus-cloud-cluster-native.conf
 
 %files nc
 %doc tools/nc-hooks
@@ -660,8 +686,8 @@ exit 0
 %systemd_post eucalyptus-cloud.service
 %sysctl_apply 70-eucalyptus-cloud.conf || :
 
-%post cc
-%systemd_post eucalyptus-cluster.service
+%post cc-native
+%systemd_post eucalyptus-cluster-native.service
 
 %post nc
 %systemd_post eucalyptus-node.service
@@ -679,8 +705,8 @@ usermod -a -G libvirt eucalyptus || :
 %preun common-java
 %systemd_preun eucalyptus-cloud.service
 
-%preun cc
-%systemd_preun eucalyptus-cluster.service
+%preun cc-native
+%systemd_preun eucalyptus-cluster-native.service
 
 %preun nc
 %systemd_preun eucalyptus-node.service
@@ -692,8 +718,8 @@ usermod -a -G libvirt eucalyptus || :
 %postun common-java
 %systemd_postun eucalyptus-cloud.service
 
-%postun cc
-%systemd_postun eucalyptus-cluster.service
+%postun cc-native
+%systemd_postun eucalyptus-cluster-native.service
 
 %postun nc
 %systemd_postun eucalyptus-node.service
@@ -703,7 +729,8 @@ usermod -a -G libvirt eucalyptus || :
 
 
 %changelog
-* Tue Jul 24 2018 Steve Jones <steve.jones@appscale.com> - 5.0
+* Wed Jul 25 2018 Steve Jones <steve.jones@appscale.com> - 5.0
+- Add cc-native rpm
 - Remove PopulateSnapPoints.groovy script
 - Package eucalyptus-cloud default vmoptions
 

systemd/Makefile

@@ -43,13 +43,17 @@ install: deploy
 	mkdir -p $(DESTDIR)/$(prefix)/usr/lib/modules-load.d
 	mkdir -p $(DESTDIR)/$(prefix)/usr/lib/sysctl.d
 	mkdir -p $(DESTDIR)/$(prefix)/usr/lib/tmpfiles.d
-	mkdir -p $(DESTDIR)/$(prefix)/usr/lib/systemd/system
+	mkdir -p $(DESTDIR)/$(prefix)/usr/lib/systemd/system/eucalyptus-cloud.service.d
 	install -m 0644 modules-load.d/*.conf $(DESTDIR)/$(prefix)/usr/lib/modules-load.d
 	install -m 0644 sysctl.d/*.conf $(DESTDIR)/$(prefix)/usr/lib/sysctl.d
 	install -m 0644 tmpfiles.d/*.conf $(DESTDIR)/$(prefix)/usr/lib/tmpfiles.d
 	install -m 0644 units/*.service $(DESTDIR)/$(prefix)/usr/lib/systemd/system
-	# For backwards compatibility with ``service eucalyptus-cc/nc start''
-	ln -fs eucalyptus-cluster.service $(DESTDIR)/$(prefix)/usr/lib/systemd/system/eucalyptus-cc.service
+	install -m 0644 units.d/eucalyptus-cloud-cluster-native.conf \
+		$(DESTDIR)/$(prefix)/usr/lib/systemd/system/eucalyptus-cloud.service.d
+
+	# For backwards compatibility with ``service eucalyptus-cluster/cc/nc start''
+	ln -fs eucalyptus-cloud.service $(DESTDIR)/$(prefix)/usr/lib/systemd/system/eucalyptus-cluster.service
+	ln -fs eucalyptus-cloud.service $(DESTDIR)/$(prefix)/usr/lib/systemd/system/eucalyptus-cc.service
 	ln -fs eucalyptus-node.service $(DESTDIR)/$(prefix)/usr/lib/systemd/system/eucalyptus-nc.service
 
 uninstall:
@@ -74,5 +78,7 @@ uninstall:
 			rm -f $(DESTDIR)/$(prefix)/usr/lib/systemd/system/$$(basename $$unit_file); \
 		done; \
 	fi
+	@$(RM) -f $(DESTDIR)/$(prefix)/usr/lib/systemd/system/eucalyptus-cloud.service.d/*.conf
+	@$(RM) -f $(DESTDIR)/$(prefix)/usr/lib/systemd/system/eucalyptus-cluster.service
 	@$(RM) -f $(DESTDIR)/$(prefix)/usr/lib/systemd/system/eucalyptus-cc.service
 	@$(RM) -f $(DESTDIR)/$(prefix)/usr/lib/systemd/system/eucalyptus-nc.service

systemd/units/eucalyptus-cluster.service → systemd/units/eucalyptus-cluster-native.service

@@ -1,5 +1,5 @@
 [Unit]
-Description=Eucalyptus cluster controller
+Description=Eucalyptus legacy cluster controller native backend
 After=network.target
 Wants=chronyd.service