← Back to team overview

cloud-init-dev team mailing list archive

Re: [Merge] ~rjschwei/cloud-init:tmplExpand into cloud-init:master

 

over all, changes look fine. two questions inline.  

Diff comments:

> diff --git a/systemd/cloud-init-local.service.tmpl b/systemd/cloud-init-local.service.tmpl
> index ff9c644..870ccf1 100644
> --- a/systemd/cloud-init-local.service.tmpl
> +++ b/systemd/cloud-init-local.service.tmpl
> @@ -13,6 +13,10 @@ Before=shutdown.target
>  Before=sysinit.target
>  Conflicts=shutdown.target
>  {% endif %}
> +{% if variant in ["suse"] %}
> +Before=basic.target
> +Conflicts=shutdown.target

why basic.target not sysinit.target?

> +{% endif %}
>  RequiresMountsFor=/var/lib/cloud
>  
>  [Service]
> diff --git a/systemd/cloud-init.service.tmpl b/systemd/cloud-init.service.tmpl
> index 2c71889..0dd45e5 100644
> --- a/systemd/cloud-init.service.tmpl
> +++ b/systemd/cloud-init.service.tmpl
> @@ -13,6 +13,11 @@ After=networking.service
>  {% if variant in ["centos", "fedora", "redhat"] %}
>  After=network.service
>  {% endif %}
> +{% if variant in ["suse"] %}
> +Requires=wicked.service
> +After=wicked.service
> +After=dbus.service

this probably shouldnt specifically need to be declared, right?
cloud-init doesn't use the dbus.service itself, so whatever is using it should declare it?

> +{% endif %}
>  Before=network-online.target
>  Before=sshd-keygen.service
>  Before=sshd.service


-- 
https://code.launchpad.net/~rjschwei/cloud-init/+git/cloud-init/+merge/331140
Your team cloud-init commiters is requested to review the proposed merge of ~rjschwei/cloud-init:tmplExpand into cloud-init:master.


References