diff options
| author | Kim Hagen <kim.sidney@gmail.com> | 2018-10-21 21:30:24 +0200 |
|---|---|---|
| committer | Kim Hagen <kim.sidney@gmail.com> | 2018-10-21 21:30:24 +0200 |
| commit | 46678295c78dac338111ec68c4bde2e005ef4491 (patch) | |
| tree | 6f1390b693e86f6bc9171d4324ce81e15803d676 | |
| parent | 2b6402ad8ddba958396c8f0ec88602da51c8bbaa (diff) | |
| download | vyos-cloud-init-46678295c78dac338111ec68c4bde2e005ef4491.tar.gz vyos-cloud-init-46678295c78dac338111ec68c4bde2e005ef4491.zip | |
make cloud-init compile on debian jessie
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | systemd/cloud-config.service.tmpl | 1 | ||||
| -rw-r--r-- | systemd/cloud-final.service.tmpl | 1 | ||||
| -rw-r--r-- | systemd/cloud-init.service.tmpl | 4 |
4 files changed, 1 insertions, 13 deletions
@@ -47,12 +47,6 @@ pyflakes: pyflakes3: @$(CWD)/tools/run-pyflakes3 -unittest: clean_pyc - nosetests $(noseopts) tests/unittests cloudinit - -unittest3: clean_pyc - nosetests3 $(noseopts) tests/unittests cloudinit - ci-deps-ubuntu: @$(PYVER) $(CWD)/tools/read-dependencies --distro ubuntu --test-distro @@ -67,8 +61,6 @@ pip-test-requirements: @echo "Installing cloud-init test dependencies..." $(PIP_INSTALL) -r "$@.txt" -q -test: $(unittests) - check_version: @if [ "$(READ_VERSION)" != "$(CODE_VERSION)" ]; then \ echo "Error: read-version version '$(READ_VERSION)'" \ diff --git a/systemd/cloud-config.service.tmpl b/systemd/cloud-config.service.tmpl index bdee3ce0..b2661f63 100644 --- a/systemd/cloud-config.service.tmpl +++ b/systemd/cloud-config.service.tmpl @@ -1,6 +1,7 @@ ## template:jinja [Unit] Description=Apply the settings specified in cloud-config +Before=vyos-router.service After=network-online.target cloud-config.target Wants=network-online.target cloud-config.target diff --git a/systemd/cloud-final.service.tmpl b/systemd/cloud-final.service.tmpl index 8207b18c..e2b91255 100644 --- a/systemd/cloud-final.service.tmpl +++ b/systemd/cloud-final.service.tmpl @@ -15,7 +15,6 @@ ExecStart=/usr/bin/cloud-init modules --mode=final RemainAfterExit=yes TimeoutSec=0 KillMode=process -TasksMax=infinity # Output needs to appear in instance console output StandardOutput=journal+console diff --git a/systemd/cloud-init.service.tmpl b/systemd/cloud-init.service.tmpl index b92e8abc..0f152967 100644 --- a/systemd/cloud-init.service.tmpl +++ b/systemd/cloud-init.service.tmpl @@ -3,8 +3,6 @@ Description=Initial cloud-init job (metadata service crawler) DefaultDependencies=no Wants=cloud-init-local.service -Wants=sshd-keygen.service -Wants=sshd.service After=cloud-init-local.service After=systemd-networkd-wait-online.service {% if variant in ["ubuntu", "unknown", "debian"] %} @@ -21,8 +19,6 @@ After=wicked.service After=dbus.service {% endif %} Before=network-online.target -Before=sshd-keygen.service -Before=sshd.service {% if variant in ["ubuntu", "unknown", "debian"] %} Before=sysinit.target Conflicts=shutdown.target |