diff options
| author | Chad Smith <chad.smith@canonical.com> | 2018-03-28 12:29:04 -0600 |
|---|---|---|
| committer | Chad Smith <chad.smith@canonical.com> | 2018-03-28 12:29:04 -0600 |
| commit | cf3eaed2e01062f9b5d47042d7a76b092970e0cf (patch) | |
| tree | 53f7c52c5a76bb586da0483699fd6d188e72f457 /config | |
| parent | 9f159f3a55a7bba7868e03d9cccd898678381f03 (diff) | |
| parent | 8caa3bcf8f2c5b3a448b9d892d4cf53ed8db9be9 (diff) | |
| download | vyos-cloud-init-cf3eaed2e01062f9b5d47042d7a76b092970e0cf.tar.gz vyos-cloud-init-cf3eaed2e01062f9b5d47042d7a76b092970e0cf.zip | |
merge from master at 18.2
Diffstat (limited to 'config')
| -rw-r--r-- | config/cloud.cfg.tmpl | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/config/cloud.cfg.tmpl b/config/cloud.cfg.tmpl index 32de9c9b..3129d4eb 100644 --- a/config/cloud.cfg.tmpl +++ b/config/cloud.cfg.tmpl @@ -4,6 +4,8 @@ {% if variant in ["freebsd"] %} syslog_fix_perms: root:wheel +{% elif variant in ["suse"] %} +syslog_fix_perms: root:root {% endif %} # A set of users which may be applied and/or used by various modules # when a 'default' entry is found it will reference the 'default_user' @@ -70,7 +72,8 @@ cloud_config_modules: # Emit the cloud config ready event # this can be used by upstart jobs for 'start on cloud-config'. - emit_upstart - - snap_config + - snap + - snap_config # DEPRECATED- Drop in version 18.2 {% endif %} - ssh-import-id - locale @@ -84,6 +87,9 @@ cloud_config_modules: - apt-pipelining - apt-configure {% endif %} +{% if variant in ["ubuntu"] %} + - ubuntu-advantage +{% endif %} {% if variant in ["suse"] %} - zypper-add-repo {% endif %} @@ -100,7 +106,7 @@ cloud_config_modules: # The modules that run in the 'final' stage cloud_final_modules: {% if variant in ["ubuntu", "unknown", "debian"] %} - - snappy + - snappy # DEPRECATED- Drop in version 18.2 {% endif %} - package-update-upgrade-install {% if variant in ["ubuntu", "unknown", "debian"] %} @@ -111,9 +117,9 @@ cloud_final_modules: {% if variant not in ["freebsd"] %} - puppet - chef - - salt-minion - mcollective {% endif %} + - salt-minion - rightscale_userdata - scripts-vendor - scripts-per-once |