[Merge] ~mwhudson/livecd-rootfs/+git/livecd-rootfs:ubuntu-core-installer into livecd-rootfs:ubuntu/master

[Dan Bungert]

I don't spot any problems, but I'd love to see the includes.chroot.base.live redundancy removed.  

> Not sure if it's worth trying to tidy this stuff up.

I think it's worth it.  Any detail here that is incorrect and discovered late means we are hoping for a quick package migration at the end of the cycle.

Diff comments:

> diff --git a/live-build/ubuntu-core-installer/includes.chroot.base.live/etc/cloud/cloud.cfg b/live-build/ubuntu-core-installer/includes.chroot.base.live/etc/cloud/cloud.cfg
> new file mode 100644
> index 0000000..e9571af
> --- /dev/null
> +++ b/live-build/ubuntu-core-installer/includes.chroot.base.live/etc/cloud/cloud.cfg
> @@ -0,0 +1,117 @@
> +# The top level settings are used as module

How much do we expect that includes.chroot.base.live is in lockstep with live-server?

> +# 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
> +
> +# If this is set, 'root' will not be able to ssh in and they
> +# will get a message to login instead as the default $user
> +disable_root: true
> +
> +# This will cause the set+update hostname module to not operate (if true)
> +preserve_hostname: true
> +
> +ssh_pwauth: yes
> +chpasswd:
> +    expire: false
> +
> +# This is the initial network config.
> +# It can be overwritten by cloud-init or subiquity.
> +network:
> +    version: 2
> +    ethernets:
> +        zz-all-en:
> +            match:
> +                name: "en*"
> +            dhcp4: true
> +        zz-all-eth:
> +            match:
> +                name: "eth*"
> +            dhcp4: true
> +
> +# We used to have a custom final_message here.  Just use the default instead.
> +
> +# Example datasource config
> +# datasource:
> +#    Ec2:
> +#      metadata_urls: [ 'blah.com' ]
> +#      timeout: 5 # (defaults to 50 seconds)
> +#      max_wait: 10 # (defaults to 120 seconds)
> +
> +# The modules that run in the 'init' stage
> +cloud_init_modules:
> + - bootcmd
> + - write-files
> + - ca-certs
> + - rsyslog
> + - users-groups
> + - ssh
> +
> +# The modules that run in the 'config' stage
> +cloud_config_modules:
> +# Emit the cloud config ready event
> +# this can be used by upstart jobs for 'start on cloud-config'.
> + - ssh-import-id
> + - set-passwords
> + - timezone
> + - disable-ec2-metadata
> + - runcmd
> +
> +# The modules that run in the 'final' stage
> +cloud_final_modules:
> + - scripts-per-once
> + - scripts-user
> + - ssh-authkey-fingerprints
> + - keys-to-console
> + - phone-home
> + - final-message
> +
> +# System and/or distro specific settings
> +# (not accessible to handlers/transforms)
> +system_info:
> +   # This will affect which distro class gets used
> +   distro: ubuntu
> +   # Default user name + that default users groups (if added/used)
> +   default_user:
> +     name: installer
> +     lock_passwd: false
> +     gecos: Ubuntu
> +     groups: [adm, audio, cdrom, dialout, dip, floppy, lxd, netdev, plugdev, sudo, video]
> +     sudo: ["ALL=(ALL) NOPASSWD:ALL"]
> +     shell: /usr/bin/subiquity-shell
> +   # Automatically discover the best ntp_client
> +   ntp_client: auto
> +   # Other config here will be given to the distro class and/or path classes
> +   paths:
> +      cloud_dir: /var/lib/cloud/
> +      templates_dir: /etc/cloud/templates/
> +      upstart_dir: /etc/init/
> +   package_mirrors:
> +     - arches: [i386, amd64]
> +       failsafe:
> +         primary: http://archive.ubuntu.com/ubuntu
> +         security: http://security.ubuntu.com/ubuntu
> +       search:
> +         primary:
> +           - http://%(ec2_region)s.ec2.archive.ubuntu.com/ubuntu/
> +           - http://%(availability_zone)s.clouds.archive.ubuntu.com/ubuntu/
> +           - http://%(region)s.clouds.archive.ubuntu.com/ubuntu/
> +         security: []
> +     - arches: [arm64, armel, armhf]
> +       failsafe:
> +         primary: http://ports.ubuntu.com/ubuntu-ports
> +         security: http://ports.ubuntu.com/ubuntu-ports
> +       search:
> +         primary:
> +           - http://%(ec2_region)s.ec2.ports.ubuntu.com/ubuntu-ports/
> +           - http://%(availability_zone)s.clouds.ports.ubuntu.com/ubuntu-ports/
> +           - http://%(region)s.clouds.ports.ubuntu.com/ubuntu-ports/
> +         security: []
> +     - arches: [default]
> +       failsafe:
> +         primary: http://ports.ubuntu.com/ubuntu-ports
> +         security: http://ports.ubuntu.com/ubuntu-ports
> +   ssh_svcname: ssh


-- 
https://code.launchpad.net/~mwhudson/livecd-rootfs/+git/livecd-rootfs/+merge/466280
Your team Ubuntu Core Development Team is subscribed to branch livecd-rootfs:ubuntu/master.