[GitHub] cloudstack pull request #1541: Systemd packaging for Ubuntu 16.04

[wido]

Github user wido closed the pull request at:

https://github.com/apache/cloudstack/pull/1541


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] cloudstack pull request #1541: Systemd packaging for Ubuntu 16.04

[vincentbernat]

Github user vincentbernat commented on a diff in the pull request:

https://github.com/apache/cloudstack/pull/1541#discussion_r74198886
  
--- Diff: debian/rules ---
@@ -136,5 +156,8 @@ override_dh_auto_install:
 override_dh_installinit:
dh_installinit -pcloudstack-management -pcloudstack-agent 
-pcloudstack-usage --onlyscripts --no-start
 
+override_dh_systemd_enable:
+   dh_systemd_enable -pcloudstack-agent -pcloudstack-usage --with systemd
--- End diff --

I didn't mean the `--with systemd` to be here, just on the `dh` invocation 
in the `%` target (like it now is).


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] cloudstack pull request #1541: Systemd packaging for Ubuntu 16.04

[wido]

Github user wido commented on a diff in the pull request:

https://github.com/apache/cloudstack/pull/1541#discussion_r73848786
  
--- Diff: debian/cloudstack-agent.install ---
@@ -18,12 +18,11 @@
 /etc/cloudstack/agent/agent.properties
 /etc/cloudstack/agent/environment.properties
 /etc/cloudstack/agent/log4j-cloud.xml
+/etc/default/cloudstack-agent
 /etc/profile.d/cloudstack-agent-profile.sh
 /etc/logrotate.d/cloudstack-agent
-/etc/init.d/cloudstack-agent
 /usr/bin/cloudstack-setup-agent
--- End diff --

Maybe, never tried that before. Might be possible. But shall we do that in 
a different PR? Merge this one and then fix that.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] cloudstack pull request #1541: Systemd packaging for Ubuntu 16.04

[vincentbernat]

Github user vincentbernat commented on a diff in the pull request:

https://github.com/apache/cloudstack/pull/1541#discussion_r73830801
  
--- Diff: debian/rules ---
@@ -116,17 +132,24 @@ override_dh_auto_install:
 
# cloudstack-usage
mkdir $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/usage
-   mkdir $(DESTDIR)/var/log/$(PACKAGE)/usage
mkdir $(DESTDIR)/usr/share/$(PACKAGE)-usage
mkdir $(DESTDIR)/usr/share/$(PACKAGE)-usage/plugins
install -D usage/target/cloud-usage-$(VERSION).jar 
$(DESTDIR)/usr/share/$(PACKAGE)-usage/lib/$(PACKAGE)-usage.jar
install -D usage/target/dependencies/* 
$(DESTDIR)/usr/share/$(PACKAGE)-usage/lib/
cp usage/target/transformed/db.properties 
$(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/usage/
cp usage/target/transformed/log4j-cloud_usage.xml 
$(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/usage/log4j-cloud.xml
-   install -D packaging/debian/init/cloud-usage 
$(DESTDIR)/$(SYSCONFDIR)/init.d/$(PACKAGE)-usage
+
+   install -d -m0755 debian/$(PACKAGE)-usage/etc/init.d
+   install -D -m0755 packaging/debian/$(PACKAGE)-usage.init 
debian/$(PACKAGE)-usage/etc/init.d/$(PACKAGE)-usage
+   install -d -m0755 debian/$(PACKAGE)-usage/lib/systemd/system
+   install -m0644 packaging/debian/$(PACKAGE)-usage.service 
debian/$(PACKAGE)-usage/lib/systemd/system/$(PACKAGE)-usage.service
+   install -m0644 packaging/debian/$(PACKAGE)-usage.default 
$(DESTDIR)/$(SYSCONFDIR)/default/$(PACKAGE)-usage
 
 override_dh_installinit:
dh_installinit -pcloudstack-management -pcloudstack-agent 
-pcloudstack-usage --onlyscripts --no-start
 
+override_dh_systemd_enable:
+   dh_systemd_enable -pcloudstack-agent -pcloudstack-usage
+
--- End diff --

This bit needs the `--with systemd` bit mentioned above.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] cloudstack pull request #1541: Systemd packaging for Ubuntu 16.04

[rhtyd]

Github user rhtyd commented on a diff in the pull request:

https://github.com/apache/cloudstack/pull/1541#discussion_r73830805
  
--- Diff: debian/control ---
@@ -3,7 +3,7 @@ Section: libs
 Priority: extra
 Maintainer: Wido den Hollander 
 Build-Depends: debhelper (>= 9), openjdk-8-jdk | openjdk-7-jdk, 
genisoimage,
- python-mysql.connector, maven (>= 3) | maven3, python (>= 2.7)
+ python-mysql.connector, maven (>= 3) | maven3, python (>= 2.7), 
lsb-release
--- End diff --

@vincentbernat that should be okay, we can use Xenial to build pkgs for 
both Xenial and Precise. At some point we'll need to stop building packages for 
Precise.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] cloudstack pull request #1541: Systemd packaging for Ubuntu 16.04

[vincentbernat]

Github user vincentbernat commented on a diff in the pull request:

https://github.com/apache/cloudstack/pull/1541#discussion_r73830730
  
--- Diff: debian/rules ---
@@ -5,9 +5,18 @@ PACKAGE = $(shell dh_listpackages|head -n 1|cut -d '-' -f 
1)
 SYSCONFDIR = "/etc"
 DESTDIR = "debian/tmp"
 
+ifeq ($(shell lsb_release -sr), 14.04)
+SUBSTVARS = -Vjre:Depends="openjdk-7-jre-headless" 
-Vjdk:Depends="openjdk-7-jdk" -Vinit:"Depends:jsvc"
+else
+SUBSTVARS = -Vjre:Depends="openjdk-8-jre-headless" 
-Vjdk:Depends="openjdk-8-jdk" -Vinit:"Depends:systemd"
+endif
+
 %:
dh $@ --with python2
--- End diff --

You need to do `--with python2,systemd`. Otherwise, systemd unit won't be 
enabled automatically and the integration won't happen (no restart of the 
service on upgrade for example).


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] cloudstack pull request #1541: Systemd packaging for Ubuntu 16.04

[vincentbernat]

Github user vincentbernat commented on a diff in the pull request:

https://github.com/apache/cloudstack/pull/1541#discussion_r73830557
  
--- Diff: debian/control ---
@@ -3,7 +3,7 @@ Section: libs
 Priority: extra
 Maintainer: Wido den Hollander 
 Build-Depends: debhelper (>= 9), openjdk-8-jdk | openjdk-7-jdk, 
genisoimage,
- python-mysql.connector, maven (>= 3) | maven3, python (>= 2.7)
+ python-mysql.connector, maven (>= 3) | maven3, python (>= 2.7), 
lsb-release
--- End diff --

For systemd integration, you need to Build-Depends on dh-systemd. 
Unfortunately, this will make the package unbuildable on Precise. See below.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] cloudstack pull request #1541: Systemd packaging for Ubuntu 16.04

[vincentbernat]

Github user vincentbernat commented on a diff in the pull request:

https://github.com/apache/cloudstack/pull/1541#discussion_r73830499
  
--- Diff: debian/cloudstack-agent.install ---
@@ -18,12 +18,11 @@
 /etc/cloudstack/agent/agent.properties
 /etc/cloudstack/agent/environment.properties
 /etc/cloudstack/agent/log4j-cloud.xml
+/etc/default/cloudstack-agent
 /etc/profile.d/cloudstack-agent-profile.sh
 /etc/logrotate.d/cloudstack-agent
-/etc/init.d/cloudstack-agent
 /usr/bin/cloudstack-setup-agent
--- End diff --

You can keep the init.d file for everybody. If the the system is running 
systemd, a service with the same basename will override the init.d file.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---