From 8129a37a936de781467c4d053f5ad6b1bcf585ba Mon Sep 17 00:00:00 2001
From: zsdc <taras@vyos.io>
Date: Fri, 29 Jan 2021 18:19:30 +0200
Subject: T3270: Backported all changes from the equuleus branch

The behavior of VyOS modules was almost totally changed. Therefore instead of changes, here is a list of what is supported by new versions:

`cc_vyos.py`:

  - extended logging for debugging purposes
  - work with any environment or datasource
  - all available in VyOS SSH keys (ssh-dss, ssh-rsa, ecdsa-sha2-nistp256, ecdsa-sha2-nistp384, ssh-ed25519, ecdsa-sha2-nistp521) with options
  - both encrypted and plain-text passwords
  - multiple user accounts
  - the fallback user creating (default "vyos/vyos") in credentials are missed in a Meta-Data
  - interfaces configuration using Network-Config v1 or v2
  - fallback interface config (DHCP on eth0) if Network-config is not available
  - both IPv4 and IPv6 addresses in Network-Config
  - MTU, multiple addresses, DHCP or static addresses, gateway, routes, DNS nameserver, DNS search domain in Network-Config
  - filtration of a hostname value from metadata
  - VyOS-specific options from the OVF template
  - automatically enabling SSH server

`cc_vyos_userdata.py`:

set and delete configuration commands inside the User-Data (#cloud-config). See details: https://github.com/vyos/vyos-cloud-init/commit/1607eec32641ad93ea211e447336b3366c28de06

Configuration template:

  - enabled `write_files` module
  - disabled the `runcmd` module (functionality replaced by `cc_vyos_userdata.py` and `write_files`)
---
 config/cloud.cfg.tmpl | 46 +++++++++++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 19 deletions(-)

(limited to 'config')

diff --git a/config/cloud.cfg.tmpl b/config/cloud.cfg.tmpl
index 0847ab3d..be06edfc 100644
--- a/config/cloud.cfg.tmpl
+++ b/config/cloud.cfg.tmpl
@@ -1,36 +1,44 @@
-## template:jinja
-# The top level settings are used as module
-# and system configuration.
+# This will cause the set+update hostname module to not operate (if true)
+preserve_hostname: true
 
+# Do not change SSH password-based authentication settings
+ssh_pwauth: unchanged
+
+# Configuring Azure datasource
 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:
- - vyos
+  - vyos
+  - write_files
+  - vyos_userdata
 
 # The modules that run in the 'final' stage
 cloud_final_modules:
- - runcmd
 
+# Users, necessary for Cloud-init 18.4
+users:
+  - default
 
 # System and/or distro specific settings
 # (not accessible to handlers/transforms)
 system_info:
-   # This will affect which distro class gets used
-   distro: debian
-   # Default user name + that default users groups (if added/used)
-   default_user:
-     name: vyos
-   # Other config here will be given to the distro class and/or path classes
-   paths:
-      cloud_dir: /opt/vyatta/etc/config/cloud/
-      templates_dir: /etc/cloud/templates/
-      upstart_dir: /etc/init/
+  # This will affect which distro class gets used
+  distro: debian
+  # Default user name + that default users groups (if added/used)
+  default_user:
+    name: vyos
+  # Other config here will be given to the distro class and/or path classes
+  paths:
+    cloud_dir: /opt/vyatta/etc/config/cloud/
+    templates_dir: /etc/cloud/templates/
+    upstart_dir: /etc/init/
+
-- 
cgit v1.2.3