commit cb736cbc023382ef792465b7d6b3b89797446a25
Author: Jonathan Rosser <jonathan.rosser@rd.bbc.co.uk>
Date:   Tue Oct 6 16:23:23 2020 +0100

    Add vars file for ubuntu focal
    
    Change-Id: I3e61f1dfa44ea6b612b5f12ffe704ec06ffddcad

diff --git a/vars/ubuntu-18.04.yml b/vars/ubuntu-18.04.yml
new file mode 100644
index 0000000..6c8ee4f
--- /dev/null
+++ b/vars/ubuntu-18.04.yml
@@ -0,0 +1,65 @@
+---
+# Copyright 2016, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+_nspawn_hosts_container_image_url: "http://cdimage.ubuntu.com/ubuntu-base/releases/18.04/release/ubuntu-base-18.04-base-{{ nspawn_cache_map.arch }}.tar.gz"
+
+_nspawn_hosts_distro_packages:
+  - bridge-utils
+  - btrfs-progs
+  - dbus
+  - dnsmasq
+  - git
+  - iptables
+  - irqbalance
+  - psmisc
+  - systemd-container
+
+_nspawn_container_distro_required_packages:
+  - gnupg
+
+_nspawn_container_distro_packages:
+  - apt-transport-https
+  - ca-certificates
+  - cron
+  - dbus
+  - debianutils
+  - gcc
+  - iproute2
+  - iputils-ping
+  - libnss-resolve
+  - libpython3.6
+  - locales
+  - netbase
+  - openssh-server
+  - openssl
+  - python-apt
+  - python-dev
+  - rsync
+  - sudo
+  - systemd
+  - tar
+  - tzdata
+  - wget
+
+_nspawn_cache_map:
+  distro: ubuntu
+  arch: "{{ nspawn_architecture_mapping.get(ansible_architecture) }}"
+  release: bionic
+
+_nspawn_copy_from_host:
+  - /etc/apt/sources.list
+  - /etc/apt/apt.conf.d/
+  - /etc/apt/preferences.d/
+  - /etc/apt/trusted.gpg.d
diff --git a/vars/ubuntu-20.04.yml b/vars/ubuntu-20.04.yml
new file mode 100644
index 0000000..1df7f36
--- /dev/null
+++ b/vars/ubuntu-20.04.yml
@@ -0,0 +1,65 @@
+---
+# Copyright 2016, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+_nspawn_hosts_container_image_url: "http://cdimage.ubuntu.com/ubuntu-base/releases/20.04/release/ubuntu-base-20.04-base-{{ nspawn_cache_map.arch }}.tar.gz"
+
+_nspawn_hosts_distro_packages:
+  - bridge-utils
+  - btrfs-progs
+  - dbus
+  - dnsmasq
+  - git
+  - iptables
+  - irqbalance
+  - psmisc
+  - systemd-container
+
+_nspawn_container_distro_required_packages:
+  - gnupg
+
+_nspawn_container_distro_packages:
+  - apt-transport-https
+  - ca-certificates
+  - cron
+  - dbus
+  - debianutils
+  - gcc
+  - iproute2
+  - iputils-ping
+  - libnss-resolve
+  - libpython3.6
+  - locales
+  - netbase
+  - openssh-server
+  - openssl
+  - python-apt
+  - python-dev
+  - rsync
+  - sudo
+  - systemd
+  - tar
+  - tzdata
+  - wget
+
+_nspawn_cache_map:
+  distro: ubuntu
+  arch: "{{ nspawn_architecture_mapping.get(ansible_architecture) }}"
+  release: bionic
+
+_nspawn_copy_from_host:
+  - /etc/apt/sources.list
+  - /etc/apt/apt.conf.d/
+  - /etc/apt/preferences.d/
+  - /etc/apt/trusted.gpg.d
diff --git a/vars/ubuntu.yml b/vars/ubuntu.yml
deleted file mode 100644
index ebf8468..0000000
--- a/vars/ubuntu.yml
+++ /dev/null
@@ -1,67 +0,0 @@
----
-# Copyright 2016, Rackspace US, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-_nspawn_hosts_container_image_url: "http://cdimage.ubuntu.com/ubuntu-base/releases/18.04/release/ubuntu-base-18.04-base-{{ nspawn_cache_map.arch }}.tar.gz"
-
-_nspawn_hosts_distro_packages:
-  - bridge-utils
-  - btrfs-progs
-  - dbus
-  - dnsmasq
-  - git
-  - iptables
-  - irqbalance
-  - psmisc
-  - systemd-container
-
-_nspawn_container_distro_required_packages:
-  - gnupg
-
-_nspawn_container_distro_packages:
-  - apt-transport-https
-  - ca-certificates
-  - cron
-  - dbus
-  - debianutils
-  - gcc
-  - iproute2
-  - iputils-ping
-  - libnss-resolve
-  - libpython2.7
-  - libpython3.6
-  - locales
-  - netbase
-  - openssh-server
-  - openssl
-  - python2.7
-  - python-apt
-  - python-dev
-  - rsync
-  - sudo
-  - systemd
-  - tar
-  - tzdata
-  - wget
-
-_nspawn_cache_map:
-  distro: ubuntu
-  arch: "{{ nspawn_architecture_mapping.get(ansible_architecture) }}"
-  release: bionic
-
-_nspawn_copy_from_host:
-  - /etc/apt/sources.list
-  - /etc/apt/apt.conf.d/
-  - /etc/apt/preferences.d/
-  - /etc/apt/trusted.gpg.d