Merge ~raharper/cloud-init:redhat-fix-spec-systemd into cloud-init:master

[Ryan Harper]

Update redhat spec to use distro release version to determine if we use systemd

The typical rpm build process will examine the spec file to determine
which packages should be installed in the boot root. This requires
the specfile to declare that it needs system. Provide this information
by checking which version in which the rpm is being built and exporting
requirements for systemd.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:48fe9867cf257e76bd3e377cc32407bb53e48bc1
https://jenkins.ubuntu.com/server/job/cloud-init-ci/502/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-amd64/502
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-arm64/502
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-ppc64el/502
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-s390x/502
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=vm-i386/502

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/502/rebuild

review: Approve (continuous-integration)

[Scott Moser (smoser)]

This looks fine. Go ahead and commit and push
But please make subject line of commit to be 74 chars or less.

(It might be the mobile view that makes me think it is. I did not count)

review: Approve

7e919ae... by Ryan Harper on 2017-06-09

Merge branch 'redhat-fix-spec-systemd' of git.launchpad.net:~raharper/cloud-init into redhat-fix-spec-systemd

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:7e919aeec88f3570f7eb3900684d5595c77f7144
https://jenkins.ubuntu.com/server/job/cloud-init-ci/505/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-amd64/505
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-arm64/505
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-ppc64el/505
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-s390x/505
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=vm-i386/505

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/505/rebuild

review: Approve (continuous-integration)

diff --git a/packages/redhat/cloud-init.spec.in b/packages/redhat/cloud-init.spec.in
index 1939ca8..3e92c98 100644
--- a/packages/redhat/cloud-init.spec.in
+++ b/packages/redhat/cloud-init.spec.in
@@ -1,10 +1,12 @@
 ## template: cheetah
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%if %{undefined systemd_requires}
-%define init_system sysvinit
-%else
+%define use_systemd (0%{?fedora} && 0%{?fedora} >= 18) || (0%{?rhel} && 0%{?rhel} >= 7)
+
+%if %{use_systemd}
 %define init_system systemd
+%else
+%define init_system sysvinit
 %endif
 
 # See: http://www.zarb.org/~jasonc/macros.php
@@ -29,6 +31,18 @@ BuildRequires:  python-setuptools
 %if "%{?el6}" == "1"
 BuildRequires:  python-argparse
 %endif
+%if %{use_systemd}
+Requires:           systemd
+BuildRequires:      systemd
+Requires:           systemd-units
+BuildRequires:      systemd-units
+%else
+Requires:           initscripts >= 8.36
+Requires(postun):   initscripts
+Requires(post):     chkconfig
+Requires(preun):    chkconfig
+%endif
+
 # These are runtime dependencies, but declared as BuildRequires so that
 # - tests can be run here.
 # - parts of cloud-init such (setup.py) use these dependencies.
@@ -68,8 +82,9 @@ Patch${size}: $p
 #end for
 
 %if "%{init_system}" == "systemd"
-BuildRequires:  systemd-units
-%{systemd_requires}
+Requires(post):       systemd
+Requires(preun):      systemd
+Requires(postun):     systemd
 %else
 Requires(post):       chkconfig
 Requires(postun):     initscripts