diff options
| author | zsdc <taras@vyos.io> | 2020-03-11 21:20:58 +0200 |
|---|---|---|
| committer | zsdc <taras@vyos.io> | 2020-03-11 21:22:23 +0200 |
| commit | c6627bc05a57645e6af8b9a5a67e452d9f37e487 (patch) | |
| tree | b754b3991e5e57a9ae9155819f73fa0cbd4be269 /config | |
| parent | ca9a4eb26b41c204d1bd3a15586b14a5dde950bb (diff) | |
| parent | 13e82554728b1cb524438163784e5b955c7c5ed0 (diff) | |
| download | vyos-cloud-init-c6627bc05a57645e6af8b9a5a67e452d9f37e487.tar.gz vyos-cloud-init-c6627bc05a57645e6af8b9a5a67e452d9f37e487.zip | |
Cloud-init: T2117: Updated to 20.1
- Merge 20.1 version from the Canonical repository
- Removed unneeded changes in datasources (now only OVF datasource is not equal to upstream's version)
- Adapted cc_vyos module to new Cloud-init version
- Changed Jenkinsfile to use build scripts, provided by upstream
Diffstat (limited to 'config')
| -rw-r--r-- | config/cloud.cfg.d/README | 4 | ||||
| -rw-r--r-- | config/cloud.cfg.tmpl | 23 |
2 files changed, 21 insertions, 6 deletions
diff --git a/config/cloud.cfg.d/README b/config/cloud.cfg.d/README index 60702e9d..036b80bf 100644 --- a/config/cloud.cfg.d/README +++ b/config/cloud.cfg.d/README @@ -1,3 +1,3 @@ -# All files in this directory will be read by cloud-init -# They are read in lexical order. Later files overwrite values in +# All files with the '.cfg' extension in this directory will be read by +# cloud-init. They are read in lexical order. Later files overwrite values in # earlier files. diff --git a/config/cloud.cfg.tmpl b/config/cloud.cfg.tmpl index 0847ab3d..8f98cb96 100644 --- a/config/cloud.cfg.tmpl +++ b/config/cloud.cfg.tmpl @@ -2,15 +2,30 @@ # The top level settings are used as module # and system configuration. +# 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' +# from the distro configuration specified below +users: + - default + +# This will cause the set+update hostname module to not operate (if true) +preserve_hostname: true + +# Example datasource config +# datasource: +# Ec2: +# metadata_urls: [ 'blah.com' ] +# timeout: 5 # (defaults to 50 seconds) +# max_wait: 10 # (defaults to 120 seconds) datasource: Azure: agent_command: [/usr/bin/python3, -u, /usr/sbin/waagent, -start] -# This will cause the set+update hostname module to not operate (if true) -preserve_hostname: true +# disable customization for VMware +disable_vmware_customization: true -users: - - default +# The modules that run in the 'init' stage +cloud_init_modules: # The modules that run in the 'config' stage cloud_config_modules: |